From oleonard at myacpl.org  Tue Jul  2 15:39:09 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  2 Jul 2013 09:39:09 -0400
Subject: [Koha-patches] [PATCH] Bug 10522 - Javascript error on acquisition
	pages: YAHOO is not defined
Message-ID: <1372772349-22700-1-git-send-email-oleonard@myacpl.org>

acq.js includes an immediately invoked function expression, which means
that it runs whether or not it is called. Because this function tries to
reference the YAHOO object, it triggers an error on pages which don't
include the main YAHOO assets. Only the basketgroups page uses this
function and YAHOO assets.

It's probably possible to make this a regular function, but I propose
simply wrapping it in a check for the YAHOO object so that it only
executes on pages where YAHOO exists--the basketgroups page.

To test, apply the patch, clear your browser cache, and test on both the
basketgroups page and at least one page which also includes acq.js
(addorderiso2709.pl, neworderempty.pl, aqbudgets.pl, suggestion.pl,
etc.) and confirm that the browser reports no JavaScript errors.
---
 koha-tmpl/intranet-tmpl/prog/en/js/acq.js |  280 ++++++++++++++---------------
 1 file changed, 140 insertions(+), 140 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
index 067cd08..b9039ea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
@@ -60,181 +60,181 @@ function isNum(v,maybenull) {
 //=======================================================================
 // Functions for drag-and-drop functionality
 
+if( typeof(YAHOO) === "object"){
+    (function() {
 
-(function() {
-
-var Dom = YAHOO.util.Dom;
-var Event = YAHOO.util.Event;
-var DDM = YAHOO.util.DragDropMgr;
-
-DDApp = {
-    init: function() {
-    var uls = document.getElementsByTagName('ul');
-    var i,j;
-    var ddtarget;
-    for (i=0; i<uls.length;i=i+1) {
-        if (uls[i].className == "draglist" || uls[i].className == "draglist_alt") {
-            ddtarget = YAHOO.util.DragDropMgr.getDDById(uls[i].id);
-// The yahoo drag and drop is written (broken or not) in such a way, that if an element is subscribed as a target multiple times,
-// it has to be unlinked multiple times, so we need to test whether it is allready a target, otherwise we'll have a problem when closing the group
-            if( ! ddtarget ) {
-                new YAHOO.util.DDTarget(uls[i].id);
-            }
-            var children = uls[i].getElementsByTagName('li');
-            for( j=0; j<children.length; j=j+1) {
-// The yahoo drag and drop is (broken or not) in such a way, that if an element is subscribed as a target multiple times,
-// it has to be unlinked multiple times, so we need to test whether it is allready a target, otherwise we'll have a problem when closing the group
-                ddtarget = YAHOO.util.DragDropMgr.getDDById(children[j].id);
+    var Dom = YAHOO.util.Dom;
+    var Event = YAHOO.util.Event;
+    var DDM = YAHOO.util.DragDropMgr;
+
+    DDApp = {
+        init: function() {
+        var uls = document.getElementsByTagName('ul');
+        var i,j;
+        var ddtarget;
+        for (i=0; i<uls.length;i=i+1) {
+            if (uls[i].className == "draglist" || uls[i].className == "draglist_alt") {
+                ddtarget = YAHOO.util.DragDropMgr.getDDById(uls[i].id);
+    // The yahoo drag and drop is written (broken or not) in such a way, that if an element is subscribed as a target multiple times,
+    // it has to be unlinked multiple times, so we need to test whether it is allready a target, otherwise we'll have a problem when closing the group
                 if( ! ddtarget ) {
-                    new DDList(children[j].id);
+                    new YAHOO.util.DDTarget(uls[i].id);
+                }
+                var children = uls[i].getElementsByTagName('li');
+                for( j=0; j<children.length; j=j+1) {
+    // The yahoo drag and drop is (broken or not) in such a way, that if an element is subscribed as a target multiple times,
+    // it has to be unlinked multiple times, so we need to test whether it is allready a target, otherwise we'll have a problem when closing the group
+                    ddtarget = YAHOO.util.DragDropMgr.getDDById(children[j].id);
+                    if( ! ddtarget ) {
+                        new DDList(children[j].id);
+                    }
                 }
             }
         }
-    }
-    }
-};
+        }
+    };
 
 
-// drag and drop implementation
+    // drag and drop implementation
 
-DDList = function(id, sGroup, config) {
+    DDList = function(id, sGroup, config) {
 
-    DDList.superclass.constructor.call(this, id, sGroup, config);
+        DDList.superclass.constructor.call(this, id, sGroup, config);
 
-    this.logger = this.logger || YAHOO;
-    var el = this.getDragEl();
-    Dom.setStyle(el, "opacity", 0.67); // The proxy is slightly transparent
+        this.logger = this.logger || YAHOO;
+        var el = this.getDragEl();
+        Dom.setStyle(el, "opacity", 0.67); // The proxy is slightly transparent
 
-    this.goingUp = false;
-    this.lastY = 0;
-};
+        this.goingUp = false;
+        this.lastY = 0;
+    };
 
-YAHOO.extend(DDList, YAHOO.util.DDProxy, {
+    YAHOO.extend(DDList, YAHOO.util.DDProxy, {
 
-    startDrag: function(x, y) {
-        this.logger.log(this.id + " startDrag");
+        startDrag: function(x, y) {
+            this.logger.log(this.id + " startDrag");
 
-        // make the proxy look like the source element
-        var dragEl = this.getDragEl();
-        var clickEl = this.getEl();
-        Dom.setStyle(clickEl, "visibility", "hidden");
+            // make the proxy look like the source element
+            var dragEl = this.getDragEl();
+            var clickEl = this.getEl();
+            Dom.setStyle(clickEl, "visibility", "hidden");
 
-        dragEl.innerHTML = clickEl.innerHTML;
+            dragEl.innerHTML = clickEl.innerHTML;
 
-        Dom.setStyle(dragEl, "color", Dom.getStyle(clickEl, "color"));
-        Dom.setStyle(dragEl, "backgroundColor", Dom.getStyle(clickEl, "backgroundColor"));
-        Dom.setStyle(dragEl, "border", "2px solid gray");
-    },
+            Dom.setStyle(dragEl, "color", Dom.getStyle(clickEl, "color"));
+            Dom.setStyle(dragEl, "backgroundColor", Dom.getStyle(clickEl, "backgroundColor"));
+            Dom.setStyle(dragEl, "border", "2px solid gray");
+        },
 
-    endDrag: function(e) {
+        endDrag: function(e) {
 
-        var srcEl = this.getEl();
-        var proxy = this.getDragEl();
+            var srcEl = this.getEl();
+            var proxy = this.getDragEl();
 
-        // Show the proxy element and animate it to the src element's location
-        Dom.setStyle(proxy, "visibility", "");
-        var a = new YAHOO.util.Motion(
-            proxy, {
-                points: {
-                    to: Dom.getXY(srcEl)
-                }
-            },
-            0.2,
-            YAHOO.util.Easing.easeOut
-        )
-        var proxyid = proxy.id;
-        var thisid = this.id;
-
-        // Hide the proxy and show the source element when finished with the animation
-        a.onComplete.subscribe(function() {
-                Dom.setStyle(proxyid, "visibility", "hidden");
-                Dom.setStyle(thisid, "visibility", "");
-            });
-        a.animate();
-// if we are in basketgrouping page, when finished moving, edit the basket's info to reflect new status
-        if(typeof(basketgroups) != 'undefined') {
+            // Show the proxy element and animate it to the src element's location
+            Dom.setStyle(proxy, "visibility", "");
+            var a = new YAHOO.util.Motion(
+                proxy, {
+                    points: {
+                        to: Dom.getXY(srcEl)
+                    }
+                },
+                0.2,
+                YAHOO.util.Easing.easeOut
+            )
+            var proxyid = proxy.id;
+            var thisid = this.id;
+
+            // Hide the proxy and show the source element when finished with the animation
             a.onComplete.subscribe(function() {
-                var reg = new RegExp("[-]+", "g");
-// add a changed input to each moved basket, so we know which baskets to modify,
-// and so we don't need to modify each and every basket and basketgroup each time the page is loaded
-// FIXME: we shouldn't use getElementsByTagName, it's not explicit enough :-(
-                srcEl.getElementsByTagName('input')[1].value = "1";
-                if ( srcEl.parentNode.parentNode.className == "workarea" ) {
-                    var dstbgroupid = srcEl.parentNode.parentNode.getElementsByTagName('input')[srcEl.parentNode.parentNode.getElementsByTagName('input').length-2].name.split(reg)[1];
-                    srcEl.className="grouped";
-                    srcEl.getElementsByTagName('input')[0].value = dstbgroupid;
-//FIXME: again, we shouldn't be using getElementsByTagName!!
-                    srcEl.parentNode.parentNode.getElementsByTagName('input')[srcEl.parentNode.parentNode.getElementsByTagName('input').length-1].value = 1;
-                }
-                else if ( srcEl.parentNode.parentNode.className == "workarea_alt" ){
-                        srcEl.className="ungrouped";
-                        srcEl.getElementsByTagName('input')[0].value = "0";
-                }
-            });
-        }
-    },
+                    Dom.setStyle(proxyid, "visibility", "hidden");
+                    Dom.setStyle(thisid, "visibility", "");
+                });
+            a.animate();
+    // if we are in basketgrouping page, when finished moving, edit the basket's info to reflect new status
+            if(typeof(basketgroups) != 'undefined') {
+                a.onComplete.subscribe(function() {
+                    var reg = new RegExp("[-]+", "g");
+    // add a changed input to each moved basket, so we know which baskets to modify,
+    // and so we don't need to modify each and every basket and basketgroup each time the page is loaded
+    // FIXME: we shouldn't use getElementsByTagName, it's not explicit enough :-(
+                    srcEl.getElementsByTagName('input')[1].value = "1";
+                    if ( srcEl.parentNode.parentNode.className == "workarea" ) {
+                        var dstbgroupid = srcEl.parentNode.parentNode.getElementsByTagName('input')[srcEl.parentNode.parentNode.getElementsByTagName('input').length-2].name.split(reg)[1];
+                        srcEl.className="grouped";
+                        srcEl.getElementsByTagName('input')[0].value = dstbgroupid;
+    //FIXME: again, we shouldn't be using getElementsByTagName!!
+                        srcEl.parentNode.parentNode.getElementsByTagName('input')[srcEl.parentNode.parentNode.getElementsByTagName('input').length-1].value = 1;
+                    }
+                    else if ( srcEl.parentNode.parentNode.className == "workarea_alt" ){
+                            srcEl.className="ungrouped";
+                            srcEl.getElementsByTagName('input')[0].value = "0";
+                    }
+                });
+            }
+        },
 
-    onDragDrop: function(e, id) {
+        onDragDrop: function(e, id) {
 
-        // If there is one drop interaction, the li was dropped either on the list,
-        // or it was dropped on the current location of the source element.
-        if (DDM.interactionInfo.drop.length === 1) {
+            // If there is one drop interaction, the li was dropped either on the list,
+            // or it was dropped on the current location of the source element.
+            if (DDM.interactionInfo.drop.length === 1) {
 
-            // The position of the cursor at the time of the drop (YAHOO.util.Point)
-            var pt = DDM.interactionInfo.point;
+                // The position of the cursor at the time of the drop (YAHOO.util.Point)
+                var pt = DDM.interactionInfo.point;
 
-            // The region occupied by the source element at the time of the drop
-            var region = DDM.interactionInfo.sourceRegion;
+                // The region occupied by the source element at the time of the drop
+                var region = DDM.interactionInfo.sourceRegion;
 
-            // Check to see if we are over the source element's location.  We will
-            // append to the bottom of the list once we are sure it was a drop in
-            // the negative space (the area of the list without any list items)
-            if (!region.intersect(pt)) {
-                var destEl = Dom.get(id);
-                var destDD = DDM.getDDById(id);
-                destEl.appendChild(this.getEl());
-                destDD.isEmpty = false;
-                DDM.refreshCache();
+                // Check to see if we are over the source element's location.  We will
+                // append to the bottom of the list once we are sure it was a drop in
+                // the negative space (the area of the list without any list items)
+                if (!region.intersect(pt)) {
+                    var destEl = Dom.get(id);
+                    var destDD = DDM.getDDById(id);
+                    destEl.appendChild(this.getEl());
+                    destDD.isEmpty = false;
+                    DDM.refreshCache();
+                }
             }
-        }
-    },
+        },
 
-    onDrag: function(e) {
+        onDrag: function(e) {
 
-        // Keep track of the direction of the drag for use during onDragOver
-        var y = Event.getPageY(e);
+            // Keep track of the direction of the drag for use during onDragOver
+            var y = Event.getPageY(e);
 
-        if (y < this.lastY) {
-            this.goingUp = true;
-        } else if (y > this.lastY) {
-            this.goingUp = false;
-        }
-        this.lastY = y;
-    },
+            if (y < this.lastY) {
+                this.goingUp = true;
+            } else if (y > this.lastY) {
+                this.goingUp = false;
+            }
+            this.lastY = y;
+        },
 
-    onDragOver: function(e, id) {
+        onDragOver: function(e, id) {
 
-        var srcEl = this.getEl();
-        var destEl = Dom.get(id);
+            var srcEl = this.getEl();
+            var destEl = Dom.get(id);
 
-        // We are only concerned with list items, we ignore the dragover
-        // notifications for the list.
-        if (destEl.nodeName.toLowerCase() == "li") {
-            var orig_p = srcEl.parentNode;
-            var p = destEl.parentNode;
+            // We are only concerned with list items, we ignore the dragover
+            // notifications for the list.
+            if (destEl.nodeName.toLowerCase() == "li") {
+                var orig_p = srcEl.parentNode;
+                var p = destEl.parentNode;
 
-            if (this.goingUp) {
-                p.insertBefore(srcEl, destEl); // insert above
-            } else {
-                p.insertBefore(srcEl, destEl.nextSibling); // insert below
-            }
+                if (this.goingUp) {
+                    p.insertBefore(srcEl, destEl); // insert above
+                } else {
+                    p.insertBefore(srcEl, destEl.nextSibling); // insert below
+                }
 
-            DDM.refreshCache();
+                DDM.refreshCache();
+            }
         }
-    }
-});
-})();
-
+    });
+    })();
+}
 
 
 
-- 
1.7.9.5

From oleonard at myacpl.org  Tue Jul  2 16:06:09 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  2 Jul 2013 10:06:09 -0400
Subject: [Koha-patches] [PATCH] Bug 10422 - Remove references to unused and
	non-existent wizard.css
Message-ID: <1372773970-23118-1-git-send-email-oleonard@myacpl.org>

doc-head-close.inc contains a reference to "wizard.css" which doesn't
exist. The option to include it never evaluates as true, and that
section can be removed from the template.

To test, apply the patch and view any page in the staff client.
Everything should be styled as before. A search of the Koha source
should return no references to "wizard.css" or a "wizard" variable.
---
 .../prog/en/includes/doc-head-close.inc            |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index ee7f3f2..ff4cca9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -20,9 +20,6 @@
 [% IF ( login ) %]
     <link rel="stylesheet" type="text/css" href="[% themelang %]/css/login.css" />
 [% END %]
-[% IF ( wizard ) %]
-    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/wizard.css" />
-[% END %]
 
 <!-- koha core js -->
 <script type="text/javascript" src="[% themelang %]/js/staff-global.js"></script>
-- 
1.7.9.5

From oleonard at myacpl.org  Tue Jul  2 17:29:48 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  2 Jul 2013 11:29:48 -0400
Subject: [Koha-patches] [PATCH] Bug 2774 - Path to theme is hard-coded in
	many places
Message-ID: <1372778988-27532-1-git-send-email-oleonard@myacpl.org>

This patch corrects more places in Koha where the path to the "prog"
theme is hard-coded in templates, CSS, and scripts.

Staff client home page:

Paths to the Koha logo background image and the module image sprite have
been corrected. Inactive and hover states of the module links
(circulation, patrons, etc) should look correct.

addbiblio.pl:

An <img> tag is replaced with a text link and an
additional CSS class. CSS uses an image-replacement technique to display
the image as before.

To test, open a blank or existing bibliographic record for editing.
Confirm that the "tag editor" icon displays correctly in two cases: 1)
tags linked to plugin editors and 2) tags linked to authorities. Both
should look correct and work correctly.

System preferences:

The system preferences editor appends a "loading" image to system
preference submit buttons when they are clicked. This patch changes
ajax.js to insert a <span> styled with a background-image instead.

To test, open system preferences and modify any preference. Submit the
change and confirm that the "loading" image appears correctly.

Background jobs:

Any place in Koha where a background job is used displays a progress
bar. This patch corrects the path in CSS to the progress bar image. To
test, perform an action which triggers the display of a progress bar.
For instance, batch modification of items. Confirm that the progress bar
image displays correctly.

blue.css:

I don't know if this is still used by anyone, but a couple of image
paths in this CSS file have been corrected.
---
 cataloguing/addbiblio.pl                           |    6 +++---
 koha-tmpl/intranet-tmpl/prog/en/css/blue.css       |    6 +++---
 koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css   |    4 ++--
 .../intranet-tmpl/prog/en/css/preferences.css      |    9 +++++++++
 .../intranet-tmpl/prog/en/css/staff-global.css     |   18 +++++++++++++-----
 koha-tmpl/intranet-tmpl/prog/en/js/ajax.js         |   10 +++++-----
 6 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index d24972c..6592d1e 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -391,8 +391,8 @@ sub create_input {
                     maxlength=\"".$subfield_data{maxlength}."\"".
                     ($is_readonly ? "readonly=\"readonly\"" : "").
                     "\/>
-                    <span class=\"subfield_controls\"><a href=\"#\" class=\"buttonDot\"
-                       onclick=\"openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id,'".$tagslib->{$tag}->{$subfield}->{authtypecode}."','biblio'); return false;\" tabindex=\"1\" title=\"Tag Editor\"><img src=\"/intranet-tmpl/prog/img/edit-tag.png\" alt=\"Tag Editor\" /></a></span>
+                    <span class=\"subfield_controls\"><a href=\"#\" class=\"buttonDot tag_editor\"
+                       onclick=\"openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id,'".$tagslib->{$tag}->{$subfield}->{authtypecode}."','biblio'); return false;\" tabindex=\"1\">Tag editor</a></span>
             ";
     # it's a plugin field
     }
@@ -421,7 +421,7 @@ sub create_input {
                             size=\"67\"
                             maxlength=\"".$subfield_data{maxlength}."\"
                             onblur=\"Blur$function_name($index_tag); \" \/>
-                            <span class=\"subfield_controls\"><a href=\"#\" class=\"buttonDot\" onclick=\"Clic$function_name('$subfield_data{id}'); return false;\" tabindex=\"1\" title=\"Tag Editor\"><img src=\"/intranet-tmpl/prog/img/edit-tag.png\" alt=\"Tag Editor\" /></a></span>
+                            <span class=\"subfield_controls\"><a href=\"#\" class=\"buttonDot tag_editor\" onclick=\"Clic$function_name('$subfield_data{id}'); return false;\" tabindex=\"1\">Tag editor</a></span>
                     $javascript";
         } else {
             warn "Plugin Failed: $plugin";
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/blue.css b/koha-tmpl/intranet-tmpl/prog/en/css/blue.css
index 4155b14..1f28d27 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/blue.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/blue.css
@@ -39,7 +39,7 @@ h4 {
 h5 {
     font-size : 100%;	
     font-weight : bold;
-    background: url( /intranet-tmpl/prog/img/css_header.png );
+    background: url( ../../img/css_header.png );
     background-repeat:repeat-x;
     color:white;}
 
@@ -54,7 +54,7 @@ h6 {
 
 th {
     color:white;
-    background: url( /intranet-tmpl/prog/img/css_header.png );
+    background: url( ../../img/css_header.png );
     background-repeat:repeat-x;
     border-bottom : 1px solid #BCBCBC;
     border-left : 1px solid #BCBCBC;
@@ -66,7 +66,7 @@ border: 1px solid #bbbbbb;
 }
 
 input[type=submit], input[type=button], input[type=reset] {
-    background: url( /intranet-tmpl/prog/img/css_header.png );
+    background: url( ../../img/css_header.png );
     color:white;
     border:1px inset;
     margin-top:10px;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css b/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css
index 064668d..169f2a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css
@@ -13,7 +13,7 @@
 
 #doc3 {
     /* Contains the news + both columns of links + pending box + userblock box */
-    background-image:url('/intranet-tmpl/prog/img/background_koha_logo.png');
+    background-image:url('../../img/background_koha_logo.png');
     background-repeat:no-repeat;
     background-position:left top;
     padding-top: 12px;
@@ -72,7 +72,7 @@ ul.biglinks-list li {
 
 ul.biglinks-list li a.icon_general {
     /* Class used for each module link */
-    background-image:url('/intranet-tmpl/prog/img/staff-home-icons-sprite.png');
+    background-image:url('../../img/staff-home-icons-sprite.png');
     display: block;
     float: left;
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/preferences.css b/koha-tmpl/intranet-tmpl/prog/en/css/preferences.css
index c58e9a5..d9f8e16 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/preferences.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/preferences.css
@@ -73,4 +73,13 @@ h3.collapsed {
 #toolbar.floating {
     box-shadow: 0 3px 2px 0 rgba(0, 0, 0, 0.5);
     border-radius: 0;
+}
+
+.loading {
+    display: inline-block;
+    height : 16px;
+    width: 16px;
+    background: transparent url("../../img/spinner-small.gif") top left no-repeat;
+    padding : 0 4px;
+    vertical-align: middle;
 }
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index f5d5bc2..0fa93ab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1859,10 +1859,6 @@ span.permissiondesc {
   font-weight: normal;
 }
 
-img.spinner {
-    vertical-align: middle;
-    padding-right: 0.3em;
-}
 ul.budget_hierarchy {
     margin-left: 0px;
     padding-left: 0px;
@@ -2565,7 +2561,7 @@ fieldset.rows table.mceListBox {
 
 #jobpanel,#jobstatus,#jobfailed { display : none; }
 #jobstatus { margin:.4em; }
-#jobprogress{ width:200px;height:10px;border:1px solid #666;background:url('/intranet-tmpl/prog/img/progress.png') -300px 0px no-repeat; }
+#jobprogress{ width:200px;height:10px;border:1px solid #666;background:url('../../img/progress.png') -300px 0px no-repeat; }
 #selections { width : 100%; white-space : normal; }
 #selections span { margin:3px;padding:3px;background-color:#EBF3FF;-moz-border-radius:5px;border-radius:5px;white-space:nowrap;line-height:240%;font-size:75%; }
 #selections span.selected { background-color : #CCE0FC; }
@@ -2582,3 +2578,15 @@ fieldset.rows table.mceListBox {
     -webkit-box-shadow: 0px 3px 2px 0px rgba(0, 0, 0, .5);
     box-shadow: 0px 3px 2px 0px rgba(0, 0, 0, .5);
 }
+
+.tag_editor {
+    background: transparent url("../../img/edit-tag.png") top left no-repeat;
+    display : block;
+    float : left;
+    width : 16px;
+    height: 16px;
+    margin : 4px;
+    text-indent: 100%;
+    white-space: nowrap;
+    overflow: hidden;
+}
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js b/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js
index c9a45c0..a8a9241 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js
@@ -36,7 +36,7 @@ KOHA.AJAX = {
         $( selector )
             .attr( 'disabled', 'disabled' )
             .each( function () {
-                var $image = $( '<img src="/intranet-tmpl/prog/img/spinner-small.gif" alt="" class="spinner" />' );
+                var $spinner = $( '<span class="loading"></span>' );
                 var selector_type = this.localName;
                 if (selector_type === undefined) selector_type = this.nodeName; // IE only
                 switch ( selector_type.toLowerCase() ) {
@@ -48,14 +48,14 @@ KOHA.AJAX = {
                         $( this )
                             .data( 'original-text', $( this ).text )
                             .text( text )
-                            .before( $image )
+                            .before( $spinner )
                             .bind( 'click.disabled', function () { return false; } );
                         break;
                     case 'button':
                         $( this )
                             .data( 'original-text', $( this ).text() )
                             .text( text )
-                            .prepend( $image );
+                            .prepend( $spinner );
                         break;
                 }
             } );
@@ -74,12 +74,12 @@ KOHA.AJAX = {
                         $( this )
                             .text( $( this ).data( 'original-text' ) )
                             .unbind( 'click.disabled' )
-                            .prevAll( 'img.spinner' ).remove();
+                            .prevAll( 'span.loading' ).remove();
                         break;
                     case 'button':
                         $( this )
                             .text( $( this ).data( 'original-text' ) )
-                            .find( 'img.spinner' ).remove();
+                            .find( 'span.loading' ).remove();
                         break;
                 }
             } )
-- 
1.7.9.5

From oleonard at myacpl.org  Wed Jul  3 16:37:03 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  3 Jul 2013 10:37:03 -0400
Subject: [Koha-patches] [PATCH] Bug 3134 - Ability to selelct multiple
	reports to delete at once
Message-ID: <1372862224-30970-1-git-send-email-oleonard@myacpl.org>

This patch adds the option to select multiple saved reports for
deletion.

To test you must have two or more saved reports to delete. Deletion
should work properly when:

- Selecting one report for deletion by checking the box.
- Selecting more than one report for deletion by checking boxes.
- Clicking the old "Delete" link

Clicking the delete button should prompt you to confirm. Clicking cancel
should cancel.

Clicking the delete button when no boxes are checked should trigger an
alert asking you to select reports for deletion.
---
 C4/Reports/Guided.pm                               |   14 ++++++------
 .../en/modules/reports/guided_reports_start.tt     |   23 +++++++++++++++++---
 reports/guided_reports.pl                          |   11 ++++++++--
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm
index f0db7a3..9447c71 100644
--- a/C4/Reports/Guided.pm
+++ b/C4/Reports/Guided.pm
@@ -609,13 +609,13 @@ sub format_results {
 }	
 
 sub delete_report {
-    my ($id)  = @_;
-    my $dbh   = C4::Context->dbh();
-    my $query = "DELETE FROM saved_sql WHERE id = ?";
-    my $sth   = $dbh->prepare($query);
-    $sth->execute($id);
-}	
-
+    my (@ids) = @_;
+        my $dbh = C4::Context->dbh;
+        my $query = 'DELETE FROM saved_sql WHERE id IN (' . join( ',', ('?') x @ids ) . ')';
+        my $sth = $dbh->prepare($query);
+        $sth->execute(@ids);
+        $sth->finish;
+}
 
 my $SAVED_REPORTS_BASE_QRY = <<EOQ;
 SELECT s.*, r.report, r.date_run, $AREA_NAME_SQL_SNIPPET, av_g.lib AS groupname, av_sg.lib AS subgroupname,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 8c34135..60f276d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -72,7 +72,7 @@ $(document).ready(function(){
         'iDisplayLength': 20,
         'aaSorting': [[ 1, "asc" ]],
         'aoColumnDefs': [
-            { 'bSortable': false, 'bSearchable':false, 'aTargets': [-1, -2, -3, -4] },
+            { 'bSortable': false, 'bSearchable':false, 'aTargets': [0,-1, -2, -3, -4] },
             { 'bSearchable': false, 'aTargets': [3, 4] }
         ],
         'oLanguage': {
@@ -122,6 +122,15 @@ $(document).ready(function(){
             rtable.fnSetColumnVis(4, true);
         }
     });
+
+    $("#reports_form").submit(function(){
+        var checkedItems = $("input[name=ids]:checked");
+        if ($(checkedItems).size() == 0) {
+            alert(_("You must select one or more reports to delete"));
+            return false;
+        }
+        return confirm(_('Are you sure you want to delete the selected reports?'));
+    });
 [% END %]
 
 [% IF ( showsql ) %]
@@ -132,7 +141,7 @@ $(document).ready(function(){
 [% IF ( saved1 ) %]
     $(".confirmdelete").click(function(){
         $(this).parents('tr').attr("class","warn");
-        if(confirm("Are you sure you want to "+$(this).attr("title")+"?")){
+        if(confirm(_("Are you sure you want to delete this saved report?"))){
             return true;
         } else {
             $(this).parents('tr').attr("class","");
@@ -273,9 +282,12 @@ canned reports and writing custom SQL reports.</p>
                 <option value="">All</option>
             </select>
         </div>
+<form action="/cgi-bin/koha/reports/guided_reports.pl" id="reports_form" method="post">
+<input type="hidden" name="phase" value="Delete Multiple" />
         <table id="table_reports">
             <thead>
                 <tr>
+                    <th>&nbsp;</th>
                     <th>ID</th>
                     <th>Report name</th>
                     <th>Type</th>
@@ -297,6 +309,7 @@ canned reports and writing custom SQL reports.</p>
             <tbody>
                 [% FOREACH savedreport IN savedreports %]
                     [% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]
+                        <td><input type="checkbox" name="ids" value="[% savedreport.id %]" /></td>
                         <td>[% savedreport.id %]</td>
                         <td>[% savedreport.report_name %]</td>
                         <td>[% savedreport.type %]</td>
@@ -317,7 +330,7 @@ canned reports and writing custom SQL reports.</p>
                             <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Show%20SQL">Show</a>
                             [% IF ( CAN_user_reports_create_reports ) %]
                                 <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Edit%20SQL">Edit</a>
-                                <a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% savedreport.savedsql |uri %]&amp;reportname=[% savedreport.report_name |uri %]&amp;notes=[% savedreport.notes |uri %]">Duplicate</a>
+                                <a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL&amp;sql=[% savedreport.savedsql |uri %]&amp;reportname=[% savedreport.report_name |uri %]&amp;notes=[% savedreport.notes |uri %]">Duplicate</a>
                             [% END %]
                         </td>
                         <td>
@@ -331,6 +344,10 @@ canned reports and writing custom SQL reports.</p>
                 [% END %]
             </tbody>
         </table>
+        <fieldset class="action">
+            <input type="submit" value="Delete selected" />
+        </fieldset>
+    </form>
     </div>
 </div>
 [% ELSE %]<div class="dialog message">
diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index 929feea..b9c49ad 100755
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -108,11 +108,18 @@ elsif ( $phase eq 'Build new' ) {
     );
 }
 
+elsif ( $phase eq 'Delete Multiple') {
+    my @ids = $input->param('ids');
+    delete_report( @ids );
+    print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved");
+    exit;
+}
+
 elsif ( $phase eq 'Delete Saved') {
 	
 	# delete a report from the saved reports list
-	my $id = $input->param('reports');
-	delete_report($id);
+    my $ids = $input->param('reports');
+    delete_report($ids);
     print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved");
 	exit;
 }		
-- 
1.7.9.5

From oleonard at myacpl.org  Wed Jul  3 18:41:16 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  3 Jul 2013 12:41:16 -0400
Subject: [Koha-patches] [PATCH] Bug 5766 - Add configuration for excluding
	articles from DataTables sorting
Message-ID: <1372869676-2111-1-git-send-email-oleonard@myacpl.org>

Client-side table sorting should exclude articles like "a," "an," and
"the" when sorting by title. This patch adds a custom sorting plugin for
use by DataTables and a configuration line to the DataTables string
configuration file which can be translated for any language.

As an example, this patch modifies the patron checkout history template
to use the new sort on the title column.

To test, apply the patch and clear your browser cache to ensure the
revised JavaScript file is loaded. Sort the table by title. Titles
should be sorted regardless of the presences of "a," "an", or "the" at
the beginning of the title.
---
 .../prog/en/includes/datatables-strings.inc        |    1 +
 koha-tmpl/intranet-tmpl/prog/en/js/datatables.js   |   46 +++++++++++++++++++-
 .../prog/en/modules/members/readingrec.tt          |   15 ++++++-
 3 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc
index 183f511..7e939fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc
@@ -13,5 +13,6 @@
     var MSG_DT_PROCESSING = _("Processing...");
     var MSG_DT_SEARCH = _("Search:");
     var MSG_DT_ZERO_RECORDS = _("No matching records found");
+    var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the");
 //]]>
 </script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
index 703944e..fc24036 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
@@ -493,4 +493,48 @@ jQuery.extend( jQuery.fn.dataTableExt.oSort, {
     "title-string-desc": function ( a, b ) {
         return ((a < b) ? 1 : ((a > b) ? -1 : 0));
     }
-} );
\ No newline at end of file
+} );
+
+(function() {
+
+    /* Plugin to allow text sorting to ignore articles
+     *
+     * In DataTables config:
+     *     "aoColumns": [
+     *        { "sType": "anti-the" },
+     *      ]
+     * Based on the plugin found here:
+     * http://datatables.net/plug-ins/sorting#anti_the
+     * Modified to exclude HTML tags from sorting
+     * Extended to accept a string of space-separated articles
+     * from a configuration file (in English, "a," "an," and "the")
+     */
+
+    if(CONFIG_EXCLUDE_ARTICLES_FROM_SORT){
+        var articles = CONFIG_EXCLUDE_ARTICLES_FROM_SORT.split(" ");
+        var rpattern = "";
+        for(i=0;i<articles.length;i++){
+            rpattern += "^" + articles[i] + " ";
+            if(i < articles.length - 1){ rpattern += "|"; }
+        }
+        var re = new RegExp(rpattern, "i");
+    }
+
+    jQuery.extend( jQuery.fn.dataTableExt.oSort, {
+        "anti-the-pre": function ( a ) {
+            var x = String(a).replace( /<[\s\S]*?>/g, "" );
+            var y = x.trim();
+            var z = y.replace(re, "").toLowerCase();
+            return z;
+        },
+
+        "anti-the-asc": function ( a, b ) {
+            return ((a < b) ? -1 : ((a > b) ? 1 : 0));
+        },
+
+        "anti-the-desc": function ( a, b ) {
+            return ((a < b) ? 1 : ((a > b) ? -1 : 0));
+        }
+    });
+
+}());
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
index 6084357..f488234 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
@@ -8,13 +8,26 @@
 <script type="text/javascript" src="[% interface %]/[% theme %]/en/js/datatables.js"></script>
 <script type="text/javascript" id="js">
 //<![CDATA[
+
  $(document).ready(function() {
     [% IF (dateformat == 'metric') %]
         dt_add_type_uk_date();
     [% END %]
     $("#table_readingrec").dataTable($.extend(true, {}, dataTablesDefaults, {
         "sPaginationType": "four_button",
-        "aaSorting": []
+        "aaSorting": [],
+        "aoColumns": [
+            null,
+            { "sType": "anti-the" },
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null
+        ]
     }));
  });
 //]]>
-- 
1.7.9.5

From oleonard at myacpl.org  Wed Jul  3 20:42:24 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  3 Jul 2013 14:42:24 -0400
Subject: [Koha-patches] [PATCH] Bug 10125 - Babeltheque star image must use
	sprite
Message-ID: <1372876944-4406-1-git-send-email-oleonard@myacpl.org>

When I removed images from the OPAC in favor of sprites I didn't take
into account the display of star ratings from Babeltheque. This patch
copies the star ratings display from Koha's own ratings display,
though it is not dependent on JavaScript.

I'm sure testing would be easy for someone with access to the
Babeltheque service, but I do not. I temporarily modified the template
to set some variables for testing purposes:

    [% SET SEARCH_RESULT.score_int = 3 %]
    [% SET SEARCH_RESULT.score_avg = 3 %
    [% SET SEARCH_RESULT.num_scores = 87 %]

This enabled the display of the ratings, allowing me to confirm that
stars display correctly. Ratings should work with and without
OpacStarRatings enabled.
---
 .../opac-tmpl/prog/en/modules/opac-results.tt      |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
index 923effa..9150624 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -571,8 +571,16 @@ $(document).ready(function(){
                 [% END %]
 
                 [% IF ( SEARCH_RESULT.score_avg ) %]
-                    <span class="result_summary">
-                        <img src="[% themelang %]/../images/Star[% SEARCH_RESULT.score_int %].gif" title="" style="max-height: 15px;"/> <span style="font-size: 85%;">[% SEARCH_RESULT.score_avg %] / 5 (on [% SEARCH_RESULT.num_scores %] rates)</span>
+                    <div class="results_summary">
+                        [% FOREACH i  IN [ 1 2 3 4 5  ] %]
+                            [% IF ( SEARCH_RESULT.score_int >= i ) %]
+                                <div class="star-rating rater-[% i %] star star-rating-applied star-rating-readonly star-rating-on"><a title="[% i %]">[% i %]</a></div>
+                            [% ELSE   %]
+                                <div class="star-rating rater-[% i %] star star-rating-applied star-rating-readonly"><a title="[% i %]">[% i %]</a></div>
+                            [% END %]
+                        [% END %]
+                        <span id="babeltheque-rating_total_[% SEARCH_RESULT.biblionumber %]">&nbsp;&nbsp; [% SEARCH_RESULT.score_avg %] / 5 (on [% SEARCH_RESULT.num_scores %] rates)</span>
+
                         [% IF ( SEARCH_RESULT.num_critics ) %]
                             <span class="social_data">[% SEARCH_RESULT.num_critics %] Internet user critics</span>
                         [% END %]
@@ -585,7 +593,7 @@ $(document).ready(function(){
                         [% IF ( SEARCH_RESULT.num_quotations ) %]
                             <span class="social_data">[% SEARCH_RESULT.num_quotations %] Quotations</span>
                         [% END %]
-                    </span>
+                    </div>
                 [% END %]
 
                 [% IF ( LibraryThingForLibrariesID ) %]<div class="ltfl_reviews"></div>[% END %]
-- 
1.7.9.5

From oleonard at myacpl.org  Fri Jul  5 19:11:44 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  5 Jul 2013 13:11:44 -0400
Subject: [Koha-patches] [PATCH] Bug 2720 [FOLLOW-UP] Overdues which debar
	automatically should undebar automatically
Message-ID: <1373044304-9733-1-git-send-email-oleonard@myacpl.org>

This follow-up to Bug 2720 makes some template changes which I think
make the interface a little more consistent and streamlined.

Instead of incorporating the manual entry form into the table it is
broken out and follows standard form structure. This lets the table be
hidden altogether if there are no existing restrictions.

The manual entry form is hidden by default and shown when you click a
link to add a manual restriction.

These changes have been applied to both the include file used for
circulation and patron detail and to the patron entry form template.

To test, add and remove manual restrictions from the circulation page,
the patron detail page, and the patron edit page. All operations should
work correctly.
---
 .../prog/en/includes/borrower_debarments.inc       |  115 +++++++++++---------
 .../prog/en/modules/members/memberentrygen.tt      |   94 +++++++++-------
 2 files changed, 118 insertions(+), 91 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
index 9cef519..d85c19c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc
@@ -1,64 +1,73 @@
 <script type="text/javascript">
    //<![CDATA[
-
-        function confirm_remove_restriction() {
-            return confirm(_("Remove restriction?"));
-        }
-
+        $(document).ready(function(e){
+            $("#remove_restriction").on("click",function(){
+                return confirm(_("Remove restriction?"));
+            });
+            var mrform = $("#manual_restriction_form");
+            var mrlink = $("#add_manual_restriction");
+            mrform.hide();
+            mrlink.on("click",function(e){
+                $(this).hide();
+                mrform.show();
+                e.preventDefault();
+            });
+            $("#cancel_manual_restriction").on("click",function(e){
+                mrlink.show();
+                mrform.hide();
+                e.preventDefault();
+            });
+        })
     //]]>
 </script>
 
 <div id="reldebarments">
-    [% UNLESS debarments %]<p>Patron is currently unrestricted.</p>[% END %]
-
-    <table>
-        <thead>
-            <tr>
-                 <th>Type</th>
-                 <th>Comment</th>
-                 <th>Expiration</th>
-                 [% IF ( CAN_user_borrowers ) %]
-                     <th>&nbsp;</th>
-                 [% END %]
-            </tr>
-        </thead>
-
-        <tbody>
-            [% FOREACH d IN debarments %]
+    [% IF ( debarments.size < 1 ) %]
+        <p>Patron is currently unrestricted.</p>
+    [% ELSE %]
+        <table>
+            <thead>
                 <tr>
-                    <td>[% d.type %]</td>
-                    <td>[% d.comment %]</td>
-                    <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
-                    [% IF ( CAN_user_borrowers )%]
-                        <td>
-                            <a href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% borrowernumber %]&amp;borrower_debarment_id=[% d.borrower_debarment_id %]&amp;action=del" onclick="return confirm_remove_restriction()">
-                                Remove
-                            </a>
-                        </td>
-                    [% END %]
+                     <th>Type</th>
+                     <th>Comment</th>
+                     <th>Expiration</th>
+                     [% IF ( CAN_user_borrowers ) %]
+                         <th>&nbsp;</th>
+                     [% END %]
                 </tr>
-            [% END %]
-        </tbody>
-
-        [% IF ( CAN_user_borrowers )%]
-            <form method="post" action="/cgi-bin/koha/members/mod_debarment.pl">
-                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
-                <input type="hidden" name="action" value="add" />
-
-                <tfoot>
+            </thead>
+            <tbody>
+                [% FOREACH d IN debarments %]
                     <tr>
-                        <td>MANUAL</td>
-                        <td><input type="text" name="comment" /></td>
-                        <td>
-                            <input name="expiration" id="expiration" size="10" readonly="readonly" value="" class="datepicker" />
-                            <a href='#' onclick="document.getElementById('expiration').value='';">Clear Date</a>
-                        </td>
-                        <td>
-                            <input type="submit" value="Add restriction" />
-                        </td>
+                        <td>[% d.type %]</td>
+                        <td>[% d.comment %]</td>
+                        <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
+                        [% IF ( CAN_user_borrowers )%]
+                            <td>
+                                <a id="remove_restriction" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% borrowernumber %]&amp;borrower_debarment_id=[% d.borrower_debarment_id %]&amp;action=del">
+                                    Remove
+                                </a>
+                            </td>
+                        [% END %]
                     </tr>
-                </tfoot>
-            </form>
-        [% END %]
-    </table>
+                [% END %]
+            </tbody>
+        </table>
+    [% END %]
+    <p><a href="#" id="add_manual_restriction">Add manual restriction</a></p>
+    [% IF ( CAN_user_borrowers )%]
+        <form method="post" action="/cgi-bin/koha/members/mod_debarment.pl" class="clearfix">
+            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
+            <input type="hidden" name="action" value="add" />
+            <fieldset class="rows" id="manual_restriction_form">
+                <legend>Add manual restriction</legend>
+                <ol>
+                    <li><label for="rcomment">Comment:</label> <input type="text" id="rcomment" name="comment" /></li>
+                    <li><label for="rexpiration">Expiration:</label> <input name="expiration" id="rexpiration" size="10" readonly="readonly" value="" class="datepicker" />
+                        <a href='#' onclick="document.getElementById('expiration').value='';">Clear date</a></li>
+                </ol>
+            <fieldset class="action"><input type="submit" value="Add restriction" /> <a href="#" class="cancel" id="cancel_manual_restriction">Cancel</a></fieldset>
+            </fieldset>
+        </form>
+    [% END %]
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index dd60dfc..749e1f8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -35,6 +35,23 @@
         [% END %]
         $("#dateofbirth").datepicker({ maxDate: "-1D" });
         $("#entryform").preventDoubleFormSubmit();
+
+        var mrform = $("#manual_restriction_form");
+        var mrlink = $("#add_manual_restriction");
+        mrform.hide();
+        mrlink.on("click",function(e){
+            $(this).hide();
+            mrform.show();
+            e.preventDefault();
+        });
+        $("#cancel_manual_restriction").on("click",function(e){
+            $('#debarred_expiration').val('');
+            $('#add_debarment').prop('checked', false);
+            $('#debarred_comment').val('');
+            mrlink.show();
+            mrform.hide();
+            e.preventDefault();
+        });
     });
 
     function clear_entry(node) {
@@ -1296,50 +1313,51 @@
 
 			</ol>
 			</fieldset>
-    
+
               <fieldset class="rows">
                 <legend>Patron restrictions</legend>
 
-                [% UNLESS debarments %]<p>Patron is currently unrestricted.</p>[% END %]
-
-                <table>
-                    <thead>
-                        <tr>
-                             <th>Type</th>
-                             <th>Comment</th>
-                             <th>Expiration</th>
-                             <th>Remove?</th>
-                        </tr>
-                    </thead>
-
-                    <tbody>
-                        [% FOREACH d IN debarments %]
+                [% IF ( debarments.size < 1 ) %]
+                    <p>Patron is currently unrestricted.</p>
+                [% ELSE %]
+                    <table>
+                        <thead>
                             <tr>
-                                <td>[% d.type %]</td>
-                                <td>[% d.comment %]</td>
-                                <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
-                                <td>
-                                    <input type="checkbox" id="debarment_[% d.borrower_debarment_id %]" name="remove_debarment" value="[% d.borrower_debarment_id %]" />
-                                </td>
+                                 <th>Type</th>
+                                 <th>Comment</th>
+                                 <th>Expiration</th>
+                                 <th>Remove?</th>
                             </tr>
-                        [% END %]
-                    </tbody>
+                        </thead>
+
+                        <tbody>
+                            [% FOREACH d IN debarments %]
+                                <tr>
+                                    <td>[% d.type %]</td>
+                                    <td>[% d.comment %]</td>
+                                    <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
+                                    <td>
+                                        <input type="checkbox" id="debarment_[% d.borrower_debarment_id %]" name="remove_debarment" value="[% d.borrower_debarment_id %]" />
+                                    </td>
+                                </tr>
+                            [% END %]
+                        </tbody>
+                    </table>
+                [% END %]
+                    <p><a href="#" id="add_manual_restriction">Add manual restriction</a></p>
+                    <fieldset id="manual_restriction_form">
+                        <input type="hidden" id="add_debarment" name="add_debarment" value="1" />
+                        <legend>Add manual restriction</legend>
+                        <ol>
+                            <li><label for="debarred_comment">Comment: </label><input type="text" id="debarred_comment" name="debarred_comment" onchange="$('#add_debarment').prop('checked', true);" /></li>
+                            <li><label for="debarred_expiration">Expiration: </label><input name="debarred_expiration" id="debarred_expiration" size="10" readonly="readonly" value="" class="datepicker" onchange="$('#add_debarment').prop('checked', true);" />
+                                    <a href='javascript:void(0)' onclick="$('#debarred_expiration').val('');">Clear date</a></li>
 
-                    <tfoot>
-                        <tr>
-                            <td>
-                                Add new
-                                <input type="checkbox" id="add_debarment" name="add_debarment" value="1" />
-                            </td>
-                            <td><input type="text" id="debarred_comment" name="debarred_comment" onchange="$('#add_debarment').prop('checked', true);" /></td>
-                            <td>
-                                <input name="debarred_expiration" id="debarred_expiration" size="10" readonly="readonly" value="" class="datepicker" onchange="$('#add_debarment').prop('checked', true);" />
-                                <a href='javascript:void(0)' onclick="$('#debarred_expiration').val('');">Clear date</a>
-                            </td>
-                            <td><a class="btn" href='javascript:void(0)' onclick="$('#debarred_expiration').val(''); $('#add_debarment').prop('checked', false); $('#debarred_comment').val('');">Clear new restriction</a></td>
-                        </tr>
-                    </tfoot>
-                </table>
+                        </ol>
+                        <p>
+                            <a class="cancel" id="cancel_manual_restriction" href="#" onclick="">Cancel</a>
+                        </p>
+                    </fieldset>
             </fieldset>
 		[% END %]
 
-- 
1.7.9.5

From oleonard at myacpl.org  Mon Jul  8 17:48:57 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon,  8 Jul 2013 11:48:57 -0400
Subject: [Koha-patches] [PATCH] Bug 10552 - Several preferences missing from
	OPAC login page
Message-ID: <1373298537-14274-1-git-send-email-oleonard@myacpl.org>

Several system preference variables are unavailable to the OPAC login
template because they are not explicitly enabled for that page. Instead
of adding them to Auth.pm using the old method this patch uses the new
system preference check syntax using the Koha TT plugin.

The following preferences are now checked using this syntax in
masthead.inc:

OpacAddMastheadLibraryPulldown
UseCourseReserves
reviewson
OpacShowRecentComments

In order for the call in masthead.inc to the new plugin to work on all
OPAC pages "[% USE Koha %]" must be added to any template which
includes it (most of them).

Also in this patch: A change to Auth.pm to enable correct display of the
LibraryName in the title of the OPAC login page.

To test, turn on the above system preferences and confirm that the
relevant links appear under the OPAC's main search bar on all pages
including the login page.

Confirm that the text specified in the LibraryName system preference is
shown as the title of the login page.

Confirm that course reserves and comments are displayed correctly on the
biblio detail page.
---
 C4/Auth.pm                                         |   12 +++++++-----
 koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc  |   12 ++++++------
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |    8 ++++----
 .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tt   |    1 +
 .../opac-tmpl/prog/en/modules/opac-MARCdetail.tt   |    1 +
 .../opac-tmpl/prog/en/modules/opac-account.tt      |    1 +
 .../opac-tmpl/prog/en/modules/opac-advsearch.tt    |    1 +
 .../prog/en/modules/opac-alert-subscribe.tt        |    1 +
 .../prog/en/modules/opac-auth-MARCdetail.tt        |    1 +
 .../opac-tmpl/prog/en/modules/opac-auth-detail.tt  |    1 +
 koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt   |    1 +
 .../prog/en/modules/opac-authorities-home.tt       |    1 +
 .../en/modules/opac-authoritiessearchresultlist.tt |    1 +
 .../opac-tmpl/prog/en/modules/opac-browser.tt      |    1 +
 .../prog/en/modules/opac-course-details.tt         |    1 +
 .../prog/en/modules/opac-course-reserves.tt        |    1 +
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |    9 +++++----
 .../opac-tmpl/prog/en/modules/opac-downloadcart.tt |    1 +
 .../prog/en/modules/opac-downloadshelf.tt          |    1 +
 .../prog/en/modules/opac-full-serial-issues.tt     |    1 +
 .../opac-tmpl/prog/en/modules/opac-imageviewer.tt  |    1 +
 koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt   |    1 +
 .../modules/opac-memberentry-update-submitted.tt   |    1 +
 .../opac-tmpl/prog/en/modules/opac-memberentry.tt  |    1 +
 .../opac-tmpl/prog/en/modules/opac-messaging.tt    |    1 +
 koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt |    1 +
 .../opac-tmpl/prog/en/modules/opac-privacy.tt      |    1 +
 .../prog/en/modules/opac-readingrecord.tt          |    2 +-
 .../en/modules/opac-registration-confirmation.tt   |    1 +
 .../en/modules/opac-registration-email-sent.tt     |    1 +
 .../prog/en/modules/opac-registration-invalid.tt   |    1 +
 .../opac-tmpl/prog/en/modules/opac-reserve.tt      |    1 +
 .../prog/en/modules/opac-results-grouped.tt        |    1 +
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    1 +
 .../prog/en/modules/opac-search-history.tt         |    1 +
 .../prog/en/modules/opac-serial-issues.tt          |    1 +
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |    2 +-
 .../opac-tmpl/prog/en/modules/opac-showreviews.tt  |    2 +-
 .../opac-tmpl/prog/en/modules/opac-suggestions.tt  |    1 +
 koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt   |    2 +-
 .../opac-tmpl/prog/en/modules/opac-tags_subject.tt |    1 +
 .../opac-tmpl/prog/en/modules/opac-topissues.tt    |    1 +
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |    2 +-
 43 files changed, 61 insertions(+), 24 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 3c0b804..6070a92 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -328,7 +328,6 @@ sub get_template_and_user {
             noItemTypeImages             => C4::Context->preference("noItemTypeImages"),
             marcflavour                  => C4::Context->preference("marcflavour"),
             persona                      => C4::Context->preference("persona"),
-            UseCourseReserves            => C4::Context->preference("UseCourseReserves"),
     );
     if ( $in->{'type'} eq "intranet" ) {
         $template->param(
@@ -361,6 +360,7 @@ sub get_template_and_user {
             AllowMultipleCovers         => C4::Context->preference('AllowMultipleCovers'),
             EnableBorrowerFiles         => C4::Context->preference('EnableBorrowerFiles'),
             UseKohaPlugins              => C4::Context->preference('UseKohaPlugins'),
+            UseCourseReserves            => C4::Context->preference("UseCourseReserves"),
         );
     }
     else {
@@ -400,7 +400,6 @@ sub get_template_and_user {
             OpacHighlightedWords      => C4::Context->preference("OpacHighlightedWords"),
             OPACItemHolds             => C4::Context->preference("OPACItemHolds"),
             OPACShelfBrowser          => "". C4::Context->preference("OPACShelfBrowser"),
-            OpacShowRecentComments    => C4::Context->preference("OpacShowRecentComments"),
             OPACURLOpenInNewWindow    => "" . C4::Context->preference("OPACURLOpenInNewWindow"),
             OPACUserCSS               => "". C4::Context->preference("OPACUserCSS"),
             OPACMobileUserCSS         => "". C4::Context->preference("OPACMobileUserCSS"),
@@ -440,13 +439,11 @@ sub get_template_and_user {
             opacsmallimage            => "" . C4::Context->preference("opacsmallimage"),
             opacuserjs                => C4::Context->preference("opacuserjs"),
             opacuserlogin             => "" . C4::Context->preference("opacuserlogin"),
-            reviewson                 => C4::Context->preference("reviewson"),
             ShowReviewer              => C4::Context->preference("ShowReviewer"),
             ShowReviewerPhoto         => C4::Context->preference("ShowReviewerPhoto"),
             suggestion                => "" . C4::Context->preference("suggestion"),
             virtualshelves            => "" . C4::Context->preference("virtualshelves"),
             OPACSerialIssueDisplayCount => C4::Context->preference("OPACSerialIssueDisplayCount"),
-            OpacAddMastheadLibraryPulldown => C4::Context->preference("OpacAddMastheadLibraryPulldown"),
             OPACXSLTDetailsDisplay           => C4::Context->preference("OPACXSLTDetailsDisplay"),
             OPACXSLTResultsDisplay           => C4::Context->preference("OPACXSLTResultsDisplay"),
             SyndeticsClientCode          => C4::Context->preference("SyndeticsClientCode"),
@@ -982,6 +979,10 @@ sub checkauth {
         push @inputs, { name => $name, value => $value };
     }
 
+    my $LibraryNameTitle = C4::Context->preference("LibraryName");
+    $LibraryNameTitle =~ s/<(?:\/?)(?:br|p)\s*(?:\/?)>/ /sgi;
+    $LibraryNameTitle =~ s/<(?:[^<>'"]|'(?:[^']*)'|"(?:[^"]*)")*>//sg;
+
     my $template_name = ( $type eq 'opac' ) ? 'opac-auth.tmpl' : 'auth.tmpl';
     my $template = C4::Templates::gettemplate($template_name, $type, $query );
     $template->param(
@@ -993,7 +994,8 @@ sub checkauth {
         casAuthentication    => C4::Context->preference("casAuthentication"),
         suggestion           => C4::Context->preference("suggestion"),
         virtualshelves       => C4::Context->preference("virtualshelves"),
-        LibraryName          => C4::Context->preference("LibraryName"),
+        LibraryName          => "" . C4::Context->preference("LibraryName"),
+        LibraryNameTitle     => "" . $LibraryNameTitle,
         opacuserlogin        => C4::Context->preference("opacuserlogin"),
         OpacNav              => C4::Context->preference("OpacNav"),
         OpacNavRight         => C4::Context->preference("OpacNavRight"),
diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc
index 4eb56c8..b85a427 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc
@@ -29,7 +29,7 @@
 [% IF ( OpacPublic ) %]
 <div id="fluid-offset">
 [% UNLESS ( advsearch ) %]
-[% IF ( OpacAddMastheadLibraryPulldown ) %]
+[% IF Koha.Preference( 'OpacAddMastheadLibraryPulldown' ) == 1 %]
     [% IF ( OpacShowFiltersPulldownMobile and not OpacShowLibrariesPulldownMobile ) or ( not OpacShowFiltersPulldownMobile and OpacShowLibrariesPulldownMobile ) %]
         <form name="searchform" method="get" action="/cgi-bin/koha/opac-search.pl" id="searchform" class="multi-libraries single-field-mobile">
     [% ELSE %]
@@ -94,7 +94,7 @@
 [% END %]
 </div>
 
-   [% IF ( OpacAddMastheadLibraryPulldown ) %]
+   [% IF Koha.Preference( 'OpacAddMastheadLibraryPulldown' ) == 1 %]
         [% IF ( OpacShowLibrariesPulldownMobile ) %]
             <div id="libraries">
         [% ELSE %]
@@ -142,7 +142,7 @@
 
     </form>
 [% ELSE %] <!--advsearch -->
-    [% IF ( OpacAddMastheadLibraryPulldown ) %]
+    [% IF Koha.Preference( 'OpacAddMastheadLibraryPulldown' ) == 1 %]
         [% IF ( OpacShowFiltersPulldownMobile and not OpacShowLibrariesPulldownMobile ) or ( not OpacShowFiltersPulldownMobile and OpacShowLibrariesPulldownMobile ) %]
             <form name="searchform" method="get" action="/cgi-bin/koha/opac-search.pl" id="searchform" class="multi-libraries single-field-mobile">
         [% ELSE %]
@@ -170,7 +170,7 @@
     <input type="text" id = "transl1" name="q" class="left transparent" style="width: 35%; font-size: 111%;" disabled="disabled"/><div id="translControl"></div>
 </div>
 
-   [% IF ( OpacAddMastheadLibraryPulldown ) %]
+   [% IF Koha.Preference( 'OpacAddMastheadLibraryPulldown' ) == 1 %]
         [% IF ( OpacShowLibrariesPulldownMobile ) %]
             <div id="libraries">
         [% ELSE %]
@@ -192,10 +192,10 @@
 
 <div id="moresearches">
 <a href="/cgi-bin/koha/opac-search.pl">Advanced search</a>
-[% IF ( UseCourseReserves ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-course-reserves.pl">Course Reserves</a>[% END %]
+[% IF Koha.Preference( 'UseCourseReserves' ) == 1 %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-course-reserves.pl">Course reserves</a>[% END %]
 [% IF ( OpacBrowser ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a>[% END %]
 [% IF ( OpacAuthorities ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Authority search</a>[% END %]
-[% IF ( opacuserlogin && reviewson && OpacShowRecentComments ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a>[% END %]
+[% IF ( opacuserlogin && ( Koha.Preference( 'reviewson' ) == 1 ) && ( Koha.Preference( 'OpacShowRecentComments' ) == 1 ) ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a>[% END %]
 [% IF ( TagsEnabled ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-tags.pl">Tag cloud</a>[% END %]
 [% IF ( OpacCloud ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-tags_subject.pl">Subject cloud</a>[% END %]
 [% IF ( OpacTopissue ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-topissues.pl">Most popular</a>[% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 651e669..b915cb1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -30,7 +30,7 @@
 <div id="fluid-offset">
 [% UNLESS ( advsearch ) %]<form name="searchform" method="get" action="/cgi-bin/koha/opac-search.pl" id="searchform">
     <label for="masthead_search" class="left"> Search 
-	[% UNLESS ( OpacAddMastheadLibraryPulldown ) %]
+  [% UNLESS Koha.Preference( 'OpacAddMastheadLibraryPulldown' ) == 1 %]
             [% IF ( mylibraryfirst ) %] (in [% mylibraryfirst %] only)[% END %]
 	[% END %]
     </label>
@@ -84,7 +84,7 @@
 [% ELSE %]
         <input type="text" title="Type search term" id = "transl1" name="q" class="left" style="width: 35%; font-size: 111%;"/><div id="translControl"></div>
 [% END %]
-   [% IF ( OpacAddMastheadLibraryPulldown ) %]
+   [% IF Koha.Preference( 'OpacAddMastheadLibraryPulldown' ) == 1 %]
       <select name="branch_group_limit" id="select_library" class="left">
          <option value="">All libraries</option>
          [% IF BranchCategoriesLoop %]<optgroup label="Libraries">[% END %]
@@ -131,10 +131,10 @@
 
 <div id="moresearches">
 <a href="/cgi-bin/koha/opac-search.pl">Advanced search</a>
-[% IF ( UseCourseReserves ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-course-reserves.pl">Course Reserves</a>[% END %]
+[% IF Koha.Preference( 'UseCourseReserves' ) == 1 %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-course-reserves.pl">Course reserves</a>[% END %]
 [% IF ( OpacBrowser ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a>[% END %]
 [% IF ( OpacAuthorities ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Authority search</a>[% END %]
-[% IF ( opacuserlogin && reviewson && OpacShowRecentComments ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a>[% END %]
+[% IF ( opacuserlogin && ( Koha.Preference( 'reviewson' ) == 1 ) && ( Koha.Preference( 'OpacShowRecentComments' ) == 1 ) ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a>[% END %]
 [% IF ( TagsEnabled ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-tags.pl">Tag cloud</a>[% END %]
 [% IF ( OpacCloud ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-tags_subject.pl">Subject cloud</a>[% END %]
 [% IF ( OpacTopissue ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-topissues.pl">Most popular</a>[% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
index 0dc3fa7..4904660 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; ISBD view
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
index 17ea900..6e57f08 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  MARC details for record no. [% biblionumber %]
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt
index eb9ee87..bb858e8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% USE KohaDates %]
 
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your fines and charges
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
index 6d9ff8e..4fef1c6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
 [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %]
     catalog &rsaquo; Advanced search
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tt
index 07d91a2..91107c7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Serials
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-MARCdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-MARCdetail.tt
index ad5ddc7..11481d9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-MARCdetail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-MARCdetail.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% PROCESS 'opac-authorities.inc' %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Entry
 [% INCLUDE 'doc-head-close.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt
index de5eae1..8367b04 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% PROCESS 'opac-authorities.inc' %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Entry
 [% INCLUDE 'doc-head-close.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
index 9d20db3..7b8b8f9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %]
 [% IF ( opacuserlogin ) %]
  catalog &rsaquo;  Log in to your account
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt
index d9f9a69..e035c2c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Authority search
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
index db9e695..71ad40e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% PROCESS 'opac-authorities.inc' %]
 [% PROCESS 'authorities-search-results.inc' %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; [% IF ( total ) %]Authority search result[% ELSE %]No results found[% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tt
index dff5743..87801b1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  ISBD
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt
index 70ed2d1..523ba04 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% USE KohaDates %]
 [% USE AuthorisedValues %]
 [% USE ItemTypes %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt
index 98965c9..7476e69 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% USE AuthorisedValues %]
 
 [% INCLUDE 'doc-head-open.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index 4e4d140..9226dec 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -1,10 +1,11 @@
+[% USE Koha %]
 [% USE KohaDates %]
 [% USE AuthorisedValues %]
 [% SET TagsShowEnabled = ( TagsEnabled && TagsShowOnDetail ) %]
 [% SET TagsInputEnabled = ( opacuserlogin && TagsEnabled && TagsInputOnDetail ) %]
 
 [% ShowCourseReservesHeader = 0 %]
-[% IF UseCourseReserves %]
+[% IF Koha.Preference( 'UseCourseReserves' ) == 1 %]
     [% FOREACH ITEM_RESULT IN itemloop %]
        [% IF ITEM_RESULT.course_reserves %]
            [% FOREACH r IN ITEM_RESULT.course_reserves %]
@@ -959,7 +960,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
         <a href="#subscriptions">Subscriptions</a>
     </li>
 [% END %]
-[% IF ( reviewson ) %]
+[% IF ( Koha.Preference( 'reviewson' ) == 1 ) %]
     <li id="tab_comments"><a href="#comments">Comments ( [% reviews.size || 0 %] )</a></li>
 [% END %]
 
@@ -1234,7 +1235,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <!-- /Library Thing for Libraries Content -->
 
 
-[% IF ( reviewson ) %]
+[% IF ( Koha.Preference( 'reviewson' ) == 1 ) %]
 <div id="comments">
     <div id="newcomment"></div>
     [% IF ( reviews ) %]
@@ -1489,7 +1490,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
         [% ELSIF show_priority %]
             <th>Item hold queue priority</th>
         [% END %]
-        [% IF ( ShowCourseReservesHeader ) %]<th id="item_coursereserves">Course Reserves</th>[% END %]
+        [% IF ( ShowCourseReservesHeader ) %]<th id="item_coursereserves">Course reserves</th>[% END %]
         </tr></thead>
 	    <tbody>[% FOREACH ITEM_RESULT IN items %]
       [% IF ITEM_RESULT.this_branch %]<tr class="highlight-row-detail">[% ELSE %]<tr>[% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt
index 9af57c8..cbc47f6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Download cart[% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="opac-downloadcart" class="popup">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt
index 0af60cd..7c4dfd9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Download list[% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">//<![CDATA[
 	$(document).ready(function(){
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
index c37a6ef..a5862f3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Subscription information for [% bibliotitle %]
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt
index 1a06121..9a49dbc 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
 [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Images for: [% biblio.title |html %]
 [% INCLUDE 'doc-head-close.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
index 3844fc5..7403bb0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
 [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog
 [% INCLUDE 'doc-head-close.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry-update-submitted.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry-update-submitted.tt
index 21fe7de..369bfe3d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry-update-submitted.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry-update-submitted.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
 [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Updates submitted
 [% INCLUDE 'doc-head-close.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt
index 8eda352..5b86268 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% USE KohaDates %]
 [% SET userupdateview = 1 %]
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
index 8f8e6b4..dfd6eaa 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your messaging settings
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">//<![CDATA[
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt
index d10ab7b..54eacd9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Change your password
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
index 5bd84bb..3bb988f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your privacy management
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
index 05f4c45..7ee7e12 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
@@ -1,5 +1,5 @@
+[% USE Koha %]
 [% USE KohaDates %]
-
 [% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog &rsaquo; Your checkout history
 [% INCLUDE 'doc-head-close.inc' %]
 <style type="text/css">ul.ui-tabs-nav li a, ul.ui-tabs-nav li span.a  { padding:0.6em 1em; }</style>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-registration-confirmation.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-registration-confirmation.tt
index 968faa0..089de24 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-registration-confirmation.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-registration-confirmation.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
 [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog
 [% INCLUDE 'doc-head-close.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-registration-email-sent.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-registration-email-sent.tt
index 649e999..c114427 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-registration-email-sent.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-registration-email-sent.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
 [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Please confirm your registration
 [% INCLUDE 'doc-head-close.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-registration-invalid.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-registration-invalid.tt
index 12dac1d..9d466dc 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-registration-invalid.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-registration-invalid.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
 [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog
 [% INCLUDE 'doc-head-close.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
index 42d85d4..d1fdbc6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog &rsaquo;  Placing a hold
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
index 44fd575..d6b4c11 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
 [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;
 [% IF ( searchdesc ) %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
index 923effa..24f159b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% SET TagsShowEnabled = ( TagsEnabled && TagsShowOnList ) %]
 [% SET TagsInputEnabled = ( opacuserlogin && TagsEnabled && TagsInputOnList ) %]
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt
index 6ef3578..f119715 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
 [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your search history
 [% INCLUDE 'doc-head-close.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
index b0d0db7..546bc15 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Serials
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
index 66ff9bc..c9c0bca 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
@@ -1,6 +1,6 @@
+[% USE Koha %]
 [% SET TagsShowEnabled = ( TagsEnabled && TagsShowOnList ) %]
 [% SET TagsInputEnabled = ( opacuserlogin && TagsEnabled && TagsInputOnList ) %]
-
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;   [% IF ( viewshelf ) %]Contents of [% shelfname |html %][% ELSE %]Your lists[% END %][% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt
index 5b22722..0e38c68 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt
@@ -1,5 +1,5 @@
+[% USE Koha %]
 [% USE KohaDates %]
-
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Recent comments
 [% INCLUDE 'doc-head-close.inc' %]
 <link rel="alternate" type="application/rss+xml" title="[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog recent comments" href="[% OPACBaseURL %]/cgi-bin/koha/opac-showreviews.pl?format=rss" />
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
index b5a20a9..a17372f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% USE KohaAuthorisedValues %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;
 [% IF ( op_add ) %]Enter a new purchase suggestion[% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt
index a9f05c8..2935605 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt
@@ -1,5 +1,5 @@
+[% USE Koha %]
 [% USE KohaDates %]
-
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Tags
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt
index 5a6ae8c..f84bf77 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog &rsaquo;  ISBD
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt
index 460ce93..b7e94e6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Most popular titles
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
index 41ab539..32cd3b2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -1,5 +1,5 @@
+[% USE Koha %]
 [% USE KohaDates %]
-
 [% INCLUDE 'doc-head-open.inc' %]
 [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your library home
 [% INCLUDE 'doc-head-close.inc' %]
-- 
1.7.9.5

From oleonard at myacpl.org  Mon Jul  8 20:52:28 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon,  8 Jul 2013 14:52:28 -0400
Subject: [Koha-patches] [PATCH] Bug 10553 - Public lists not available from
	OPAC login page
Message-ID: <1373309548-15735-1-git-send-email-oleonard@myacpl.org>

If you are not logged in to the OPAC, looking at the login page, and you
click the Lists button to see public lists it says there are none. This
patch corrects Auth.pm so that it loads the list of public lists in this
situation.

To test you must have at least one public list. Make sure you are logged
out of the OPAC and visit the login page (/cgi-bin/koha/opac-user.pl).
Clicking the "Lists" button should show you a list of public shelves.
---
 C4/Auth.pm |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 3c0b804..e3fda83 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -1030,6 +1030,14 @@ sub checkauth {
     $template->param( OpacPublic => C4::Context->preference("OpacPublic"));
     $template->param( loginprompt => 1 ) unless $info{'nopermission'};
 
+    if($type eq 'opac'){
+        my ($total, $pubshelves) = C4::VirtualShelves::GetSomeShelfNames(undef, 'MASTHEAD');
+        $template->param(
+            pubshelves     => $total->{pubtotal},
+            pubshelvesloop => $pubshelves,
+        );
+    }
+
     if ($cas) {
 
     # Is authentication against multiple CAS servers enabled?
-- 
1.7.9.5

From colin.campbell at ptfs-europe.com  Tue Jul  9 12:48:56 2013
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Tue,  9 Jul 2013 11:48:56 +0100
Subject: [Koha-patches] [PATCH] Bug 10507 Fix namespace collision in patron
	entry
Message-ID: <1373366936-7015-1-git-send-email-colin.campbell@ptfs-europe.com>

If a warning about a duplicated patron attribute is returned
the value was being passed back for display in the warning
message with the same name as the variable in errors

as the message is displayed in the context of errors
the error value 1 was being displayed not the value
duplicated as intended.
Pass the value to the template with a unique name
---
 koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 2 +-
 members/memberentry.pl                                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 1bb8e3e..a57c03d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -176,7 +176,7 @@
 			[% END %]
             [% IF ( ERROR_extended_unique_id_failed ) %]
                 <li id="ERROR_extended_unique_id_failed">The attribute value 
-                    [% ERROR_extended_unique_id_failed %] is already is use by another patron record.</li>
+                    [% ERROR_extended_unique_id_failed_value %] is already is use by another patron record.</li>
 			[% END %]
 			</ul>
 		</div>
diff --git a/members/memberentry.pl b/members/memberentry.pl
index b7123f2..0bf3122 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -315,7 +315,7 @@ if ($op eq 'save' || $op eq 'insert'){
     foreach my $attr (@$extended_patron_attributes) {
         unless (C4::Members::Attributes::CheckUniqueness($attr->{code}, $attr->{value}, $borrowernumber)) {
             push @errors, "ERROR_extended_unique_id_failed";
-            $template->param(ERROR_extended_unique_id_failed => "$attr->{code}/$attr->{value}");
+            $template->param(ERROR_extended_unique_id_failed_value => "$attr->{code}/$attr->{value}");
         }
     }
   }
-- 
1.8.3.2.634.g7a3187e


From srdjan at catalyst.net.nz  Wed Jul 10 05:52:13 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 10 Jul 2013 15:52:13 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 10490: Overdue fines cap
	can't store decimal values
Message-ID: <1373428333-23933-1-git-send-email-srdjan@catalyst.net.nz>

From: Katrin Fischer <Katrin.Fischer.83 at web.de>

When overduefinescap was added to the issuingrules the datatype
given was decimal. This translates in MySQL to decimal(10,0).
This doesn't allow you to store decimal values and therefore
values like 4.5 are saved as 5 in the database.

To test:

On a current installation:
1) Try to enter 4.5 as Overdue fines cap. Verify that the value
   is not correctly saved.
2) Apply patch and run database update.
3) Try adding/changing an issuing rule setting Overdue fines cap
   to 4.5 again.
4) Verify the value is saved correctly.

Create a new Koha installation from scratch:
1) Verify that the issuingrules table has been created correctly
   and that you can add/mofidy issuingrules correctly.

Because this bug can create data loss, the old database update
has also been changed to avoid this problem for people updating
at a later point in time. Checkout an older version of Koha
pre 3.09.00.027.

1) Run the database updates.
2) Verify again, that adding/modifying issuingrules works correctly.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 installer/data/mysql/kohastructure.sql |  2 +-
 installer/data/mysql/updatedatabase.pl | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index f5e1862..8f9b30c 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1130,7 +1130,7 @@ CREATE TABLE `issuingrules` ( -- circulation and fine rules
   `renewalperiod` int(4) default NULL, -- renewal period in the unit set in issuingrules.lengthunit
   `reservesallowed` smallint(6) NOT NULL default "0", -- how many holds are allowed
   `branchcode` varchar(10) NOT NULL default '', -- the branch this rule is for (branches.branchcode)
-  overduefinescap decimal default NULL, -- the maximum amount of an overdue fine
+  overduefinescap decimal(28,6) default NULL, -- the maximum amount of an overdue fine
   PRIMARY KEY  (`branchcode`,`categorycode`,`itemtype`),
   KEY `categorycode` (`categorycode`),
   KEY `itemtype` (`itemtype`)
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index adc1e7f..bd84c4b 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5561,7 +5561,7 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
 
 $DBversion = '3.09.00.027';
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
-    $dbh->do("ALTER TABLE issuingrules ADD overduefinescap decimal DEFAULT NULL");
+    $dbh->do("ALTER TABLE issuingrules ADD overduefinescap decimal(28,6) DEFAULT NULL");
     my $maxfine = C4::Context->preference('MaxFine');
     if ($maxfine && $maxfine < 900) { # an arbitrary value that tells us it's not "some huge value"
       $dbh->do("UPDATE issuingrules SET overduefinescap=?",undef,$maxfine);
@@ -7036,6 +7036,14 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+
+$DBversion = "3.13.00.XXX";
+if ( CheckVersion($DBversion) ) {
+    $dbh->do("ALTER TABLE issuingrules MODIFY COLUMN overduefinescap decimal(28,6) DEFAULT NULL;");
+    print "Upgrade to $DBversion done (Bug 10490: Correct datatype for overduefinescap in issuingrules)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Wed Jul 10 06:38:50 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 10 Jul 2013 16:38:50 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 10527:
	C4::Branch::get_branch_code_from_name is useless
Message-ID: <1373431130-29702-1-git-send-email-srdjan@catalyst.net.nz>

From: Jonathan Druart <jonathan.druart at biblibre.com>

This routine is not in used and does not make sense. It should not be
used later.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Branch.pm                | 11 +----------
 labels/label-edit-batch.pl  |  1 -
 labels/label-manage.pl      |  1 -
 patroncards/edit-batch.pl   |  1 -
 patroncards/manage.pl       |  1 -
 tools/manage-marc-import.pl |  1 -
 6 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/C4/Branch.pm b/C4/Branch.pm
index 5770f7b..4ea5b19 100644
--- a/C4/Branch.pm
+++ b/C4/Branch.pm
@@ -48,7 +48,7 @@ BEGIN {
 		&mybranch
 		&GetBranchesCount
 	);
-	@EXPORT_OK = qw( &onlymine &mybranch get_branch_code_from_name );
+	@EXPORT_OK = qw( &onlymine &mybranch );
 }
 
 =head1 NAME
@@ -589,15 +589,6 @@ sub CheckBranchCategorycode {
     return $total;
 }
 
-sub get_branch_code_from_name {
-   my @branch_name = @_;
-   my $query = "SELECT branchcode FROM branches WHERE branchname=?;";
-   my $dbh = C4::Context->dbh();
-   my $sth = $dbh->prepare($query);
-   $sth->execute(@branch_name);
-   return $sth->fetchrow_array;
-}
-
 sub GetBranchesCount {
     my $dbh = C4::Context->dbh();
     my $query = "SELECT COUNT(*) AS branches_count FROM branches";
diff --git a/labels/label-edit-batch.pl b/labels/label-edit-batch.pl
index d534b87..aea4742 100755
--- a/labels/label-edit-batch.pl
+++ b/labels/label-edit-batch.pl
@@ -26,7 +26,6 @@ use CGI;
 
 use C4::Auth qw(get_template_and_user);
 use C4::Output qw(output_html_with_http_headers);
-use C4::Branch qw(get_branch_code_from_name);
 use C4::Items qw(GetItemnumberFromBarcode);
 use C4::Creators;
 use C4::Labels;
diff --git a/labels/label-manage.pl b/labels/label-manage.pl
index 7ef3300..871780d 100755
--- a/labels/label-manage.pl
+++ b/labels/label-manage.pl
@@ -27,7 +27,6 @@ use Data::Dumper;
 
 use C4::Auth qw(get_template_and_user);
 use C4::Output qw(output_html_with_http_headers);
-use autouse 'C4::Branch' => qw(get_branch_code_from_name);
 use C4::Creators;
 use C4::Labels;
 
diff --git a/patroncards/edit-batch.pl b/patroncards/edit-batch.pl
index 4897e5f..497c01c 100755
--- a/patroncards/edit-batch.pl
+++ b/patroncards/edit-batch.pl
@@ -27,7 +27,6 @@ use autouse 'Data::Dumper' => qw(Dumper);
 
 use C4::Auth qw(get_template_and_user);
 use C4::Output qw(output_html_with_http_headers);
-use C4::Branch qw(get_branch_code_from_name);
 use C4::Creators;
 use C4::Patroncards;
 
diff --git a/patroncards/manage.pl b/patroncards/manage.pl
index d052f67..2af8c0e 100755
--- a/patroncards/manage.pl
+++ b/patroncards/manage.pl
@@ -27,7 +27,6 @@ use autouse 'Data::Dumper' => qw(Dumper);
 
 use C4::Auth qw(get_template_and_user);
 use C4::Output qw(output_html_with_http_headers);
-use autouse 'C4::Branch' => qw(get_branch_code_from_name);
 use C4::Creators;
 use C4::Patroncards;
 use C4::Labels;
diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl
index 25f7769..c0584c9 100755
--- a/tools/manage-marc-import.pl
+++ b/tools/manage-marc-import.pl
@@ -36,7 +36,6 @@ use C4::ImportBatch;
 use C4::Matcher;
 use C4::BackgroundJob;
 use C4::Labels::Batch;
-use C4::Branch qw(get_branch_code_from_name);
 
 my $script_name = "/cgi-bin/koha/tools/manage-marc-import.pl";
 
-- 
1.8.1.2

From oleonard at myacpl.org  Wed Jul 10 16:01:30 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 10 Jul 2013 10:01:30 -0400
Subject: [Koha-patches] [PATCH] Bug 10566 - Improve OPAC course reserves
	pages
Message-ID: <1373464891-4683-1-git-send-email-oleonard@myacpl.org>

This patch makes various improvements to the OPAC course reserve pages:

- Descriptive page titles for both pages.
- More compact display of course information on course detail page
  (a list instead of a table, consistent with other displays of similar
  information in Koha).
- Correct capitalization.
- Added label and fieldset to course reserve search form.
- Added breadcrumb navigatio nto course reserve detail page as a path
  back to course reserves main page.

To test, apply the patch and confirm that the changes haven't broken
anything and are an improvement.
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |   50 +++++++++++
 .../prog/en/modules/opac-course-details.tt         |   95 +++++++++++---------
 .../prog/en/modules/opac-course-reserves.tt        |   14 +--
 3 files changed, 113 insertions(+), 46 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 6fd9a90..7fdb79b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -165,6 +165,56 @@ fieldset.action p {
 	margin-bottom : 1em;
 }
 
+div.rows+div.rows {
+    margin-top : .6em;
+}
+
+div.rows {
+    float : left;
+    clear : left;
+    margin: 0 0 0 0;
+    padding: 0;
+    width: 100%;
+}
+
+
+div.rows span.label {
+    float: left;
+    font-weight : bold;
+    width: 9em;
+    margin-right: 1em;
+    text-align: left;
+}
+
+div.rows ol {
+    padding: .5em 1em 0 0;
+    list-style-type: none;
+}
+
+div.rows ol li li {
+    border-bottom: 0;
+}
+
+div.rows li {
+    border-bottom :  1px solid #EEE;
+    float : left;
+    clear : left;
+    padding-bottom: .2em;
+    padding-top: .1em;
+    list-style-type: none;
+    width: 100%;
+}
+
+div.rows ul li:first-child {
+    float: none;
+    clear: none;
+    margin-left: 0;
+}
+
+div.rows ul li {
+    margin-left : 9em;
+}
+
 form {
 	display : inline;
 	margin : 0;
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt
index 70ed2d1..fdf9a08 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt
@@ -3,7 +3,7 @@
 [% USE ItemTypes %]
 [% USE Branches %]
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Course reserves for [% course.course_name %]
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="opac-main">
@@ -13,49 +13,64 @@
 
 <div id="doc2" class="yui-t7">
     <div id="yui-main">
+        <h2><a href="/cgi-bin/koha/opac-course-reserves.pl">Course reserves</a> &#8674; Course reserves for <i>[% course.course_name %]</i></h2>
+        <div class="rows clearfix">
+            <ol>
+                [% IF ( course.term ) %]<li><span class="label">Term:</span> [% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</li>[% END %]
+                <li><span class="label">Department:</span> [% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</li>
+                [% IF ( course.course_number ) %]<li><span class="label">Course number:</span> [% course.course_number %]</li>[% END %]
+                [% IF ( course.section ) %]<li><span class="label">Section:</span> [% course.section %]</li>[% END %]
+                [% IF ( course.instructors ) %]
+                    <li><span class="label">Instructors:</span>
+                        <ul>
+                            [% FOREACH i IN course.instructors %]
+                                <li><div class="instructor">[% i.firstname %] [% i.surname %]</div></li>
+                            [% END %]
+                        </ul>
+                    </li>
+                [% END %]
+                [% IF ( course.public_note ) %]<li><span class="label">Notes:</span> [% course.public_note %]</li>[% END %]
+            </ol>
+        </div>
 
-        <table>
-            <tr><th>Course Name</th><td>[% course.course_name %]</td></tr>
-            <tr><th>Term</th><td>[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</td></tr>
-            <tr><th>Department</th><td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</td></tr>
-            <tr><th>Course Number</th><td>[% course.course_number %]</td></tr>
-            <tr><th>Section</th><td>[% course.section %]</td></tr>
-            <tr><th>Instructors</th><td>[% FOREACH i IN course.instructors %]<div class="instructor">[% i.firstname %] [% i.surname %]</div>[% END %]</td></tr>
-            <tr><th>Notes</th><td>[% course.public_note %]</td></tr>
-        </table>
-
-        <table>
-            <thead>
-                <tr>
-                    <th>Title</th>
-                    <th>Item type</th>
-                    <th>Location</th>
-                    <th>Collection</th>
-                    <th>Call number</th>
-                    <th>Copy</th>
-                    <th>Status</td>
-                    <th>Date due</td>
-                    <th>Notes</th>
-                </tr>
-            </thead>
-
-            <tbody>
-                [% FOREACH cr IN course_reserves %]
+        [% IF ( course_reserves ) %]
+            <table>
+                <thead>
                     <tr>
-                        <td><a href="opac-detail.pl?biblionumber=[% cr.item.biblionumber %]">[% cr.item.title %]</a></td>
-                        <td>[% ItemTypes.GetDescription( cr.item.itype ) %]</td>
-                        <td>[% Branches.GetName( cr.item.holdingbranch ) %] <br/> <i>[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]</i></td>
-                        <td>[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]</td>
-                        <td>[% cr.item.itemcallnumber %]</td>
-                        <td>[% cr.item.copynumber %]</td>
-                        <td>[% INCLUDE 'item-status.inc' item = cr.item %]</td>
-                        <td>[% cr.issue.date_due | $KohaDates %]</td>
-                        <td>[% cr.public_note %]</td>
+                        <th>Title</th>
+                        <th>Item type</th>
+                        <th>Location</th>
+                        <th>Collection</th>
+                        <th>Call number</th>
+                        <th>Copy</th>
+                        <th>Status</td>
+                        <th>Date due</td>
+                        <th>Notes</th>
                     </tr>
-                [% END %]
-            </tbody>
-        </table>
+                </thead>
 
+                <tbody>
+                    [% FOREACH cr IN course_reserves %]
+                        <tr>
+                            <td><a href="opac-detail.pl?biblionumber=[% cr.item.biblionumber %]">[% cr.item.title %]</a></td>
+                            <td>[% ItemTypes.GetDescription( cr.item.itype ) %]</td>
+                            <td>[% Branches.GetName( cr.item.holdingbranch ) %] <br/> <i>[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]</i></td>
+                            <td>[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]</td>
+                            <td>[% cr.item.itemcallnumber %]</td>
+                            <td>[% cr.item.copynumber %]</td>
+                            <td>[% INCLUDE 'item-status.inc' item = cr.item %]</td>
+                            <td>[% cr.issue.date_due | $KohaDates %]</td>
+                            <td>[% cr.public_note %]</td>
+                        </tr>
+                    [% END %]
+                </tbody>
+            </table>
+        [% ELSE %]
+            <br style="clear:both;" />
+            <div class="dialog message">
+                <p>No reserves have been selected for this course.</p>
+            </div>
+        [% END %]
     </div>
 </div>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt
index 98965c9..12fea16 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt
@@ -1,7 +1,7 @@
 [% USE AuthorisedValues %]
 
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Courses
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="opac-main">
@@ -15,14 +15,16 @@
             <div class="yui-b">
                 <div class="yui-g">
 
+                    <h1>Courses</h1>
                     <div id="search-toolbar">
-                        <form id="search_courses_form">
-                            <input type="text" name="search_on" id="search_on" />
-                            <input type="submit" value="Search" />
+                        <form action="/cgi-bin/koha/opac-course-reserves.pl" method="get" id="search_courses_form">
+                            <fieldset>
+                                <label for="search_on">Search courses:</label> <input type="text" name="search_on" id="search_on" />
+                                <input type="submit" value="Search" />
+                            </fieldset>
                         </form>
-                    </div><!-- /toolbar -->
+                    </div><!-- /search-toolbar -->
 
-                    <h1>Courses</h1>
                     <table id="course_reserves_table">
                         <thead>
                             <tr>
-- 
1.7.9.5

From oleonard at myacpl.org  Wed Jul 10 18:40:14 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 10 Jul 2013 12:40:14 -0400
Subject: [Koha-patches] [PATCH] Bug 10558 [Follow-up] Convert records table
	in manage-marc-import.pl to ajax DataTable
Message-ID: <1373474414-6193-1-git-send-email-oleonard@myacpl.org>

This patch makes improvements to the default DataTables CSS and corrects
a couple of errors in the original patch. CSS for the "full numbers"
type pagination, used by this and the quotes editor, has been cleaned up
and made more visually consistent with the brief pagination style.

Also changed:

- removed some hard-coded paths containing "http://staff.kohadev..."
- Added a column header to the column showing record match details. This
  provides both information and a clearer target for clicking to resort
- Expanding the default table pager controls for this page and the
  quotes editor (for consistency)
---
 koha-tmpl/intranet-tmpl/prog/en/css/datatables.css |   45 ++++++++++++--------
 .../prog/en/modules/tools/manage-marc-import.tt    |    9 ++--
 .../intranet-tmpl/prog/en/modules/tools/quotes.tt  |    1 +
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css b/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
index 92e1768..8e6b867 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
@@ -58,12 +58,12 @@ div.dataTables_info {
 div.dataTables_length,
 div.dataTables_filter {
     border-left : 1px solid #FFF;
+    border-right : 1px solid #AAAAAA;
 }
 div.dataTables_filter {
     line-height : 1.9em;
 }
 div.dataTables_paginate {
-    background-color : #F4F4F4;
     padding : 0;
 }
 
@@ -73,42 +73,49 @@ div.dataTables_paginate {
     border-left : 1px solid #FFF;
     display : block;
     float : left;
-    line-height:1.6em;
-    padding: .3em .7em;
+    line-height:1.9em;
+    padding : 0.4em 0.7em;
     cursor: pointer;
 }
 
 .paging_full_numbers a.paginate_button {
+    background-color : #FFF;
+    background-repeat: no-repeat;
     color : #0000CC;
 }
 .paging_full_numbers a.paginate_button.first {
+    background-color: transparent;
     background-image : url('../../img/first.png');
-    background-repeat: no-repeat;
-    background-position : 1% center;
-    padding-left : 2em;
+    background-position : 3px center;
+    padding-left : 23px;
 }
 .paging_full_numbers a.paginate_button.previous {
+    background-color: transparent;
     background-image : url('../../img/prev.png');
-    background-repeat: no-repeat;
-    background-position : 1% center;
-    padding-left : 2em;
+    background-position : 3px center;
+    padding-left : 23px;
 }
 .paging_full_numbers a.paginate_button.next {
+    background-color: transparent;
     background-image : url('../../img/next.png');
-    background-repeat: no-repeat;
-    background-position : 96% center;
-    padding-right : 2em;
+    background-position : 93% center;
+    padding-right : 25px;
 }
 .paging_full_numbers a.paginate_button.last {
+    background-color: transparent;
     background-image : url('../../img/last.png');
-    background-repeat: no-repeat;
-    background-position : 96% center;
-    border-right : 1px solid #686868;
-    padding-right : 2em;
+    background-position : 93% center;
+    border-right : 0;
+    padding-right : 25px;
 }
 div.bottom.pager .paging_full_numbers a.paginate_button.last {
     border-right-width : 0;
 }
+
+div.bottom.pager div:first-child {
+    border-left : 0;
+}
+
 .paging_full_numbers a.paginate_active {
     background-color : #FFFFEA;
     color : #000;
@@ -203,8 +210,10 @@ div.dataTables_paginate.paging_four_button {
 
 .dataTables_processing {
     background-color: white;
-    border: 1px solid #DDDDDD;
-    color: #999999;
+    border: 1px solid #999;
+    -webkit-box-shadow: 2px 2px 3px 1px rgba(0, 0, 0, 0.2);
+    box-shadow: 2px 2px 3px 1px rgba(0, 0, 0, 0.2);
+    color: #333;
     font-size: 14px;
     height: 30px;
     left: 50%;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
index 57faa85..08d90b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
@@ -36,6 +36,7 @@ $(document).ready(function(){
       "bServerSide": true,
       "sAjaxSource": 'batch_records_ajax.pl',
       "sPaginationType": "full_numbers",
+      "sDom": '<"top pager"iflp>rt<"bottom pager"flp><"clear">',
       "aoColumns": [
           { "mDataProp": "import_record_id" },
           { "mDataProp": "citation" },
@@ -64,13 +65,13 @@ $(document).ready(function(){
                 + aData['match_id']
                 + " (" + _("score") + "="
                 + aData['score']
-                + '):' + '<a target="_blank" href="http://staff.kohadev/cgi-bin/koha/catalogue/detail.pl?biblionumber='
+                + '):' + '<a target="_blank" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber='
                 + aData['match_id'] + '">' + aData['match_citation'] + '</a>'
             );
         }
 
         $('td:eq(5)', nRow).html(
-            '<a target="_blank" href="http://staff.kohadev/cgi-bin/koha/catalogue/detail.pl?biblionumber='
+            '<a target="_blank" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber='
             + aData['matched'] + '">' + aData['matched'] + '</a>'
         );
       },
@@ -372,8 +373,8 @@ Page
             <th>#</th>
             <th>Citation</th>
             <th>Status</th>
-            <th>Match?</th>
-            <th>&nbsp;</th>
+            <th>Match type</th>
+            <th>Match details</th>
             <th>Record</th>
         </tr>
     </thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
index 493c34b..6801001 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
@@ -22,6 +22,7 @@
                     "bProcessing"       : true,
                     "bPaginate"         : true,
                     "sPaginationType"   : "full_numbers",
+                    "sDom": '<"top pager"iflp>rt<"bottom pager"flp><"clear">',
                     "sAjaxSource"       : "/cgi-bin/koha/tools/quotes/quotes_ajax.pl",
                     "aoColumns"         : [
                                             { "sWidth": "3%"  },
-- 
1.7.9.5

From srdjan at catalyst.net.nz  Thu Jul 11 03:58:08 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Thu, 11 Jul 2013 13:58:08 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 10515: The prototype for
	GetBranchCategory and GetBranchCategories is not consistent
Message-ID: <1373507888-5615-1-git-send-email-srdjan@catalyst.net.nz>

From: Jonathan Druart <jonathan.druart at biblibre.com>

The prototype is not consistent, GetBranchCategory should return only 1 result
and GetBranchCategories should not have a categorycode argument.
This patch fixes that.

Test plan:
1/ Try to add/remove/modify a library.
2/ Add some groups
3/ Add these groups to a library

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Branch.pm                                       | 63 ++++++++--------------
 admin/branches.pl                                  | 47 +++++++---------
 catalogue/search.pl                                |  2 +-
 .../prog/en/modules/admin/branches.tt              |  2 +-
 opac/opac-search.pl                                |  2 +-
 5 files changed, 44 insertions(+), 72 deletions(-)

diff --git a/C4/Branch.pm b/C4/Branch.pm
index 5770f7b..5783de9 100644
--- a/C4/Branch.pm
+++ b/C4/Branch.pm
@@ -248,7 +248,7 @@ sub ModBranch {
     }
     # sort out the categories....
     my @checkedcats;
-    my $cats = GetBranchCategory();
+    my $cats = GetBranchCategories();
     foreach my $cat (@$cats) {
         my $code = $cat->{'categorycode'};
         if ( $data->{$code} ) {
@@ -294,87 +294,66 @@ sub ModBranch {
 
 $results = GetBranchCategory($categorycode);
 
-C<$results> is an ref to an array.
+C<$results> is an hashref
 
 =cut
 
 sub GetBranchCategory {
-
-    # returns a reference to an array of hashes containing branches,
     my ($catcode) = @_;
+    return unless $catcode;
+
     my $dbh = C4::Context->dbh;
     my $sth;
 
-    #    print DEBUG "GetBranchCategory: entry: catcode=".cvs($catcode)."\n";
-    if ($catcode) {
-        $sth =
-          $dbh->prepare(
-            "select * from branchcategories where categorycode = ?");
-        $sth->execute($catcode);
-    }
-    else {
-        $sth = $dbh->prepare("Select * from branchcategories");
-        $sth->execute();
-    }
-    my @results;
-    while ( my $data = $sth->fetchrow_hashref ) {
-        push( @results, $data );
-    }
-    $sth->finish;
-
-    #    print DEBUG "GetBranchCategory: exit: returning ".cvs(\@results)."\n";
-    return \@results;
+    $sth = $dbh->prepare(q{
+        SELECT *
+        FROM branchcategories
+        WHERE categorycode = ?
+    });
+    $sth->execute( $catcode );
+    return $sth->fetchrow_hashref;
 }
 
 =head2 GetBranchCategories
 
-  my $categories = GetBranchCategories($branchcode,$categorytype,$show_in_pulldown,$selected_in_pulldown);
+  my $categories = GetBranchCategories($categorytype,$show_in_pulldown,$selected_in_pulldown);
 
 Returns a list ref of anon hashrefs with keys eq columns of branchcategories table,
-i.e. categorycode, categorydescription, categorytype, categoryname.
-if $branchcode and/or $categorytype are passed, limit set to categories that
-$branchcode is a member of , and to $categorytype.
+i.e. categorydescription, categorytype, categoryname.
 
 =cut
 
 sub GetBranchCategories {
-    my ( $branchcode, $categorytype, $show_in_pulldown, $selected_in_pulldown ) = @_;
+    my ( $categorytype, $show_in_pulldown, $selected_in_pulldown ) = @_;
     my $dbh = C4::Context->dbh();
 
-    my $query = "SELECT c.* FROM branchcategories c";
-    my ( @where, @bind );
-
-    if( $branchcode ) {
-        $query .= ",branchrelations r, branches b ";
-        push @where, "c.categorycode = r.categorycode AND r.branchcode = ? ";
-        push @bind , $branchcode;
-    }
+    my $query = "SELECT * FROM branchcategories ";
 
+    my ( @where, @bind );
     if ( $categorytype ) {
-        push @where, " c.categorytype = ? ";
+        push @where, " categorytype = ? ";
         push @bind, $categorytype;
     }
 
     if ( defined( $show_in_pulldown ) ) {
-        push( @where, " c.show_in_pulldown = ? " );
+        push( @where, " show_in_pulldown = ? " );
         push( @bind, $show_in_pulldown );
     }
 
     $query .= " WHERE " . join(" AND ", @where) if(@where);
-    $query .= " ORDER BY categorytype,c.categorycode";
+    $query .= " ORDER BY categorytype, categorycode";
     my $sth=$dbh->prepare( $query);
     $sth->execute(@bind);
 
     my $branchcats = $sth->fetchall_arrayref({});
-    $sth->finish();
 
     if ( $selected_in_pulldown ) {
         foreach my $bc ( @$branchcats ) {
-            $bc->{'selected'} = 1 if ( $bc->{'categorycode'} eq $selected_in_pulldown );
+            $bc->{selected} = 1 if $bc->{categorycode} eq $selected_in_pulldown;
         }
     }
 
-    return( $branchcats );
+    return $branchcats;
 }
 
 =head2 GetCategoryTypes
diff --git a/admin/branches.pl b/admin/branches.pl
index 026d983..9e6b14a 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -234,14 +234,31 @@ sub editbranchform {
     my $data;
     my $oldprinter = "";
 
+
+    # make the checkboxes.....
+    my $catinfo = GetBranchCategories();
+
     if ($branchcode) {
         $data = GetBranchInfo($branchcode);
         $data = $data->[0];
+        if ( exists $data->{categories} ) {
+            # Set the selected flag for the categories of this branch
+            $catinfo = [
+                map {
+                    my $catcode = $_->{categorycode};
+                    if ( grep {/$catcode/} @{$data->{categories}} ){
+                        $_->{selected} = 1;
+                    }
+                    $_;
+                } @{$catinfo}
+            ];
+        }
 
         # get the old printer of the branch
         $oldprinter = $data->{'branchprinter'} || '';
         _branch_to_template($data, $innertemplate);
     }
+    $innertemplate->param( categoryloop => $catinfo );
 
     foreach my $thisprinter ( keys %$printers ) {
         push @printerloop, {
@@ -252,29 +269,6 @@ sub editbranchform {
     }
 
     $innertemplate->param( printerloop => \@printerloop );
-    # make the checkboxes.....
-    #
-    # We export a "categoryloop" array to the template, each element of which
-    # contains separate 'categoryname', 'categorycode', 'codedescription', and
-    # 'checked' fields. The $checked field is either empty or 1'
-
-    my $catinfo = GetBranchCategory();
-    my @categoryloop = ();
-    foreach my $cat (@$catinfo) {
-        my $checked;
-        my $tmp     = quotemeta( $cat->{'categorycode'} );
-        if ( grep { /^$tmp$/ } @{ $data->{'categories'} } ) {
-            $checked = 1;
-        }
-        push @categoryloop, {
-            categoryname    => $cat->{'categoryname'},
-            categorycode    => $cat->{'categorycode'},
-            categorytype    => $cat->{'categorytype'},
-            codedescription => $cat->{'codedescription'},
-            checked         => $checked,
-        };
-    }
-    $innertemplate->param( categoryloop => \@categoryloop );
 
     for my $obsolete ( 'categoryname', 'categorycode', 'codedescription' ) {
         $innertemplate->param(
@@ -291,7 +285,6 @@ sub editcatform {
     my $data;
 	if ($categorycode) {
         my $data = GetBranchCategory($categorycode);
-        $data = $data->[0];
         $innertemplate->param(
             categorycode    => $data->{'categorycode'},
             categoryname    => $data->{'categoryname'},
@@ -360,7 +353,7 @@ sub branchinfotable {
         my $no_categories_p = 1;
         my @categories;
         foreach my $cat ( @{ $branch->{'categories'} } ) {
-            my ($catinfo) = @{ GetBranchCategory($cat) };
+            my $catinfo = GetBranchCategory($cat);
             push @categories, { 'categoryname' => $catinfo->{'categoryname'} };
             $no_categories_p = 0;
         }
@@ -375,8 +368,8 @@ sub branchinfotable {
     }
     my @branchcategories = ();
 	for my $ctype ( GetCategoryTypes() ) {
-    	my $catinfo = GetBranchCategories(undef,$ctype);
-    	my @categories;
+        my $catinfo = GetBranchCategories($ctype);
+        my @categories;
 		foreach my $cat (@$catinfo) {
             push @categories, {
                 categoryname    => $cat->{'categoryname'},
diff --git a/catalogue/search.pl b/catalogue/search.pl
index d4e98b18..f8dab56 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -237,7 +237,7 @@ my @branch_loop = map {
     $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname}
 } keys %$branches;
 
-my $categories = GetBranchCategories(undef,'searchdomain');
+my $categories = GetBranchCategories('searchdomain');
 
 $template->param(branchloop => \@branch_loop, searchdomainloop => $categories);
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index 902f809..86fb8ce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -107,7 +107,7 @@ tinyMCE.init({
         <ol>
 		[% FOREACH categoryloo IN categoryloop %]
             <li><label for="[% categoryloo.categorycode %]">[% categoryloo.categoryname %]: </label>
-                [% IF ( categoryloo.checked ) %]
+                [% IF categoryloo.selected %]
                     <input type="checkbox" id="[% categoryloo.categorycode %]" name="[% categoryloo.categorycode %]" checked="checked" />
                 [% ELSE %]
                     <input type="checkbox" id="[% categoryloo.categorycode %]" name="[% categoryloo.categorycode %]" />
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index dfe651e..880317a 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -193,7 +193,7 @@ if (C4::Context->preference('TagsEnabled')) {
 
 my $branches = GetBranches();   # used later in *getRecords, probably should be internalized by those functions after caching in C4::Branch is established
 $template->param(
-    searchdomainloop => GetBranchCategories(undef,'searchdomain'),
+    searchdomainloop => GetBranchCategories('searchdomain'),
 );
 
 # load the language limits (for search)
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Thu Jul 11 05:19:03 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Thu, 11 Jul 2013 15:19:03 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 10504: Remove the unused
	C4::Acq::ModOrderItem routine
Message-ID: <1373512743-12589-1-git-send-email-srdjan@catalyst.net.nz>

From: Jonathan Druart <jonathan.druart at biblibre.com>

This routine has been introduced by commit
2d90fb22d43db986547bbaa945873d6dd78aab71.
The only call has been removed by commit
9eba7dc594fc0d4698da5e791d5f6f8682b2712a.

So now, this routine is useless.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Acquisition.pm       | 33 +--------------------------------
 cataloguing/moveitem.pl |  2 +-
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index b7ba2e1..1a210b5 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -59,7 +59,7 @@ BEGIN {
         &ModReceiveOrder &CancelReceipt
         &GetCancelledOrders
         &GetLastOrderNotReceivedFromSubscriptionid &GetLastOrderReceivedFromSubscriptionid
-        &NewOrderItem &ModOrderItem &ModItemOrder
+        &NewOrderItem &ModItemOrder
 
         &GetParcels &GetParcel
         &GetContracts &GetContract
@@ -1225,37 +1225,6 @@ sub ModOrder {
 
 #------------------------------------------------------------#
 
-=head3 ModOrderItem
-
-  &ModOrderItem(\%hashref);
-
-Modifies the itemnumber in the aqorders_items table. The input hash needs three entities:
-
-=over
-
-=item - itemnumber: the old itemnumber
-=item - ordernumber: the order this item is attached to
-=item - newitemnumber: the new itemnumber we want to attach the line to
-
-=back
-
-=cut
-
-sub ModOrderItem {
-    my $orderiteminfo = shift;
-    if (! $orderiteminfo->{'ordernumber'} || ! $orderiteminfo->{'itemnumber'} || ! $orderiteminfo->{'newitemnumber'}){
-        die "Ordernumber, itemnumber and newitemnumber is required";
-    }
-
-    my $dbh = C4::Context->dbh;
-
-    my $query = "UPDATE aqorders_items set itemnumber=? where itemnumber=? and ordernumber=?";
-    my @params = ($orderiteminfo->{'newitemnumber'}, $orderiteminfo->{'itemnumber'}, $orderiteminfo->{'ordernumber'});
-    my $sth = $dbh->prepare($query);
-    $sth->execute(@params);
-    return 0;
-}
-
 =head3 ModItemOrder
 
     ModItemOrder($itemnumber, $ordernumber);
diff --git a/cataloguing/moveitem.pl b/cataloguing/moveitem.pl
index 24414cc..2622c36 100755
--- a/cataloguing/moveitem.pl
+++ b/cataloguing/moveitem.pl
@@ -30,7 +30,7 @@ use C4::Context;
 use C4::Koha;
 use C4::Branch;
 use C4::ClassSource;
-use C4::Acquisition qw/GetOrderFromItemnumber ModOrder GetOrder ModOrderItem/;
+use C4::Acquisition qw/GetOrderFromItemnumber ModOrder GetOrder/;
 
 use Date::Calc qw(Today);
 
-- 
1.8.1.2

From oleonard at myacpl.org  Thu Jul 11 16:34:21 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 11 Jul 2013 10:34:21 -0400
Subject: [Koha-patches] [PATCH] Bug 10514 [Alternate] Add item link on
	acquisitions add item is too small
Message-ID: <1373553262-9935-1-git-send-email-oleonard@myacpl.org>

This alternate patch for Bug 10514 converts the "Add" and "Clear" links
to the standard "submit/cancel" format inside a fieldset. This gives
them a little more visual weight to solve the problem in a differnt way.

Based on the changes made by Liz Rea and Jonathan Druart. Same test
plan:

create a basket
add a record to it
scroll down - the link to add item and cancel should both be more
prominent now.
Click "Add item" - it should add an item.
---
 koha-tmpl/intranet-tmpl/prog/en/js/additem.js |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/additem.js b/koha-tmpl/intranet-tmpl/prog/en/js/additem.js
index 2c15b04..9dfaa1f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/additem.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/additem.js
@@ -1,5 +1,5 @@
 function addItem( node, unique_item_fields ) {
-    var index = $(node).parent().attr('id');
+    var index = $(node).closest("div").attr('id');
     var current_qty = parseInt($("#quantity").val());
     var max_qty;
     if($("#quantity_to_receive").length != 0){
@@ -12,7 +12,7 @@ function addItem( node, unique_item_fields ) {
             if ( current_qty < max_qty - 1 )
                 cloneItemBlock(index, unique_item_fields);
             addItemInList(index, unique_item_fields);
-            $("#" + index).find("a[name='buttonPlus']").text("Update");
+            $("#" + index).find("input[name='buttonPlus']").val("Update");
             $("#quantity").val(current_qty + 1).change();
         } else if ( current_qty >= max_qty ) {
             alert(window.MSG_ADDITEM_JS_CANT_RECEIVE_MORE_ITEMS
@@ -134,9 +134,12 @@ function cloneItemBlock(index, unique_item_fields) {
                 $(this).val(random);
             });
             /* Add buttons + and Clear */
-            var buttonPlus = '<a name="buttonPlus" style="cursor:pointer; margin:0 1em;" onclick="addItem(this,\'' + unique_item_fields + '\')">Add</a>';
-            var buttonClear = '<a name="buttonClear" style="cursor:pointer;" onclick="clearItemBlock(this)">' + (window.MSG_ADDITEM_JS_CLEAR || 'Clear') + '</a>';
-            $(clone).append(buttonPlus).append(buttonClear);
+            var buttonPlus = "<fieldset class=\"action\">";
+            var buttonPlusText = _("Add item");
+                buttonPlus += '<input type="button" class="addItemControl" name="buttonPlus" style="cursor:pointer; margin:0 1em;" onclick="addItem(this,\'' + unique_item_fields + '\')" value="' + buttonPlusText + '" />';
+                buttonPlus += '<a class="addItemControl cancel" name="buttonClear" style="cursor:pointer;" onclick="clearItemBlock(this)">' + (window.MSG_ADDITEM_JS_CLEAR || 'Clear') + '</a>';
+                buttonPlus += "</fieldset>";
+            $(clone).append(buttonPlus);
             /* Copy values from the original block (input) */
             $(original).find("input[name='field_value']").each(function(){
                 var kohafield = $(this).siblings("input[name='kohafield']").val();
@@ -164,7 +167,7 @@ function cloneItemBlock(index, unique_item_fields) {
 }
 
 function clearItemBlock(node) {
-    var index = $(node).parent().attr('id');
+    var index = $(node).closest("div").attr('id');
     var block = $("#"+index);
     $(block).find("input[type='text']").each(function(){
         $(this).val("");
-- 
1.7.9.5

From christophe.croullebois at biblibre.com  Thu Jul 11 17:41:18 2013
From: christophe.croullebois at biblibre.com (Christophe Croullebois)
Date: Thu, 11 Jul 2013 17:41:18 +0200
Subject: [Koha-patches] =?utf-8?q?=5BPATCH_1/1=5D_Bug_10573=3A_French_tran?=
	=?utf-8?q?slation_for_printing_a_basketgroup?=
Message-ID: <1373557278-12769-1-git-send-email-christophe.croullebois@biblibre.com>

If you want to print a basketgroup with pdf format, it will be in english.
The pdf is done with layout2pages.pm or layout3pages.pm which call layout2pages.pdf or layout3pages.pdf.
This patch adds layout3pagesfr.pm in src/acqui/pdfformat/ which calls layout3pagesfr.pdf.
And adds in basketgroup.pl the check for layout3pagesfr
To use it you have to change the systempreferences to  pdfformat::layout3pagesfr
---
 acqui/basketgroup.pl                               |    2 +-
 acqui/pdfformat/layout3pagesfr.pm                  |  439 ++++++++++++++++++++
 .../intranet-tmpl/prog/pdf/layout3pagesfr.odt      |  Bin 0 -> 13284 bytes
 .../intranet-tmpl/prog/pdf/layout3pagesfr.pdf      |  Bin 0 -> 24394 bytes
 4 files changed, 440 insertions(+), 1 deletion(-)
 create mode 100644 acqui/pdfformat/layout3pagesfr.pm
 create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout3pagesfr.odt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout3pagesfr.pdf

diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl
index 398980c..6fe4db2 100755
--- a/acqui/basketgroup.pl
+++ b/acqui/basketgroup.pl
@@ -189,7 +189,7 @@ sub printbasketgrouppdf{
     my ($basketgroupid) = @_;
     
     my $pdfformat = C4::Context->preference("OrderPdfFormat");
-    if ($pdfformat eq 'pdfformat::layout3pages' || $pdfformat eq 'pdfformat::layout2pages'){
+    if ($pdfformat eq 'pdfformat::layout3pages' || $pdfformat eq 'pdfformat::layout2pages' || $pdfformat eq 'pdfformat::layout3pagesfr'){
 	eval {
         eval "require $pdfformat";
 	    import $pdfformat;
diff --git a/acqui/pdfformat/layout3pagesfr.pm b/acqui/pdfformat/layout3pagesfr.pm
new file mode 100644
index 0000000..dc4a152
--- /dev/null
+++ b/acqui/pdfformat/layout3pagesfr.pm
@@ -0,0 +1,439 @@
+#!/usr/bin/perl
+
+#example script to print a basketgroup
+#written 07/11/08 by john.soros at biblibre.com and paul.poulain at biblibre.com
+
+# Copyright 2008-2009 BibLibre SARL
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+#you can use any PDF::API2 module, all you need to do is return the stringifyed pdf object from the printpdf sub.
+package pdfformat::layout3pagesfr;
+use vars qw($VERSION @ISA @EXPORT);
+use Number::Format qw(format_price);
+use MIME::Base64;
+use List::MoreUtils qw/uniq/;
+use strict;
+use warnings;
+use utf8;
+
+use C4::Branch qw(GetBranchDetail GetBranchName);
+
+BEGIN {
+         use Exporter   ();
+         our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
+	# set the version for version checking
+         $VERSION     = 1.00;
+	@ISA    = qw(Exporter);
+	@EXPORT = qw(printpdf);
+}
+
+
+#be careful, all the sizes (height, width, etc...) are in mm, not PostScript points (the default measurment of PDF::API2).
+#The constants exported tranform that into PostScript points (/mm for milimeter, /in for inch, pt is postscript point, and as so is there only to show what is happening.
+use constant mm => 25.4 / 72;
+use constant in => 1 / 72;
+use constant pt => 1;
+
+use PDF::API2;
+#A4 paper specs
+my ($height, $width) = (297, 210);
+use PDF::Table;
+
+sub printorders {
+    my ($pdf, $basketgroup, $baskets, $orders) = @_;
+
+    my $cur_format = C4::Context->preference("CurrencyFormat");
+    my $num;
+
+    if ( $cur_format eq 'FR' ) {
+        $num = new Number::Format(
+            'decimal_fill'      => '2',
+            'decimal_point'     => ',',
+            'int_curr_symbol'   => '',
+            'mon_thousands_sep' => ' ',
+            'thousands_sep'     => ' ',
+            'mon_decimal_point' => ','
+        );
+    } else {  # US by default..
+        $num = new Number::Format(
+            'int_curr_symbol'   => '',
+            'mon_thousands_sep' => ',',
+            'mon_decimal_point' => '.'
+        );
+    }
+
+    $pdf->mediabox($height/mm, $width/mm);
+    my $number = 3;
+    for my $basket (@$baskets){
+        my $page = $pdf->page();
+
+        # print basket header (box)
+        my $box = $page->gfx;
+        $box->rectxy(($width - 10)/mm, ($height - 5)/mm, 10/mm, ($height - 25)/mm);
+        $box->stroke;
+#         $box->restore();
+
+        # create a text
+        my $text = $page->text;
+        # add basketgroup number
+        $text->font( $pdf->corefont("Times", -encoding => "utf8"), 6/mm );
+        $text->translate(20/mm,  ($height-15)/mm);
+        $text->text("Commande N?".$basketgroup->{'id'}.". Panier N? ".$basket->{basketno}.". ".$basket->{booksellernote});
+        $text->translate(20/mm,  ($height-20)/mm);
+        $text->font( $pdf->corefont("Times", -encoding => "utf8"), 4/mm );
+        $text->text( ( $basket->{billingplace} ? "Facturation ? " . C4::Branch::GetBranchName( $basket->{billingplace} ) : "" )
+            . ( $basket->{billingplace} and $basket->{deliveryplace} ? " et " : "" )
+            . ( $basket->{deliveryplace} ? "livraison ? " . C4::Branch::GetBranchName( $basket->{deliveryplace}) : "" )
+        );
+
+        my $pdftable = new PDF::Table();
+        my $abaskets;
+        my $arrbasket;
+        my @keys = ('Document', 'Qte', 'Prix', 'Prix net', '% Remise', 'Remise', 'Taux TVA', 'Total HT', 'Total TTC');
+        for my $bkey (@keys) {
+            push(@$arrbasket, $bkey);
+        }
+        push(@$abaskets, $arrbasket);
+        foreach my $line (@{$orders->{$basket->{basketno}}}) {
+            $arrbasket = undef;
+            push( @$arrbasket,
+                $line->{title} . " / " . $line->{author} . ( $line->{isbn} ? " ISBN : " . $line->{isbn} : '' ) . ( $line->{en} ? " EN : " . $line->{en} : '' ) . ", " . $line->{itemtype} . ( $line->{publishercode} ? ' published by '. $line->{publishercode} : ""),
+                $line->{quantity},
+                $num->format_price($line->{rrpgste}),
+                $num->format_price($line->{rrpgsti}),
+                $num->format_price($line->{discount}).'%',
+                $num->format_price($line->{rrpgste} - $line->{ecostgste}),
+                $num->format_price($line->{gstrate} * 100).'%',
+                $num->format_price($line->{totalgste}),
+                $num->format_price($line->{totalgsti}),
+            );
+            push(@$abaskets, $arrbasket);
+        }
+
+        $pdftable->table($pdf, $page, $abaskets,
+                                        x => 10/mm,
+                                        w => ($width - 20)/mm,
+                                        start_y => 270/mm,
+                                        next_y  => 285/mm,
+                                        start_h => 250/mm,
+                                        next_h  => 250/mm,
+                                        padding => 5,
+                                        padding_right => 5,
+                                        background_color_odd  => "lightgray",
+                                        font       => $pdf->corefont("Times", -encoding => "utf8"),
+                                        font_size => 3/mm,
+                                        header_props   =>    {
+                                            font       => $pdf->corefont("Times", -encoding => "utf8"),
+                                            font_size  => 9,
+                                            bg_color   => 'gray',
+                                            repeat     => 1,
+                                        },
+                                        column_props => [
+                                            {
+                                                min_w => 85/mm,       # Minimum column width.
+                                            },
+                                            {
+                                                justify => 'right', # One of left|right ,
+                                            },
+                                            {
+                                                justify => 'right', # One of left|right ,
+                                            },
+                                            {
+                                                justify => 'right', # One of left|right ,
+                                            },
+                                            {
+                                                justify => 'right', # One of left|right ,
+                                            },
+                                            {
+                                                justify => 'right', # One of left|right ,
+                                            },
+                                            {
+                                                justify => 'right', # One of left|right ,
+                                            },
+                                            {
+                                                justify => 'right', # One of left|right ,
+                                            },
+                                            {
+                                                justify => 'right', # One of left|right ,
+                                            },
+                                        ],
+             );
+    }
+    $pdf->mediabox($width/mm, $height/mm);
+}
+
+sub printbaskets {
+    my ($pdf, $basketgroup, $hbaskets, $bookseller, $GSTrate, $orders) = @_;
+
+    # get library name
+    my $libraryname = C4::Context->preference("LibraryName");
+
+    my $cur_format = C4::Context->preference("CurrencyFormat");
+    my $num;
+
+    if ( $cur_format eq 'FR' ) {
+        $num = new Number::Format(
+            'decimal_fill'      => '2',
+            'decimal_point'     => ',',
+            'int_curr_symbol'   => '',
+            'mon_thousands_sep' => ' ',
+            'thousands_sep'     => ' ',
+            'mon_decimal_point' => ','
+        );
+    } else {  # US by default..
+        $num = new Number::Format(
+            'int_curr_symbol'   => '',
+            'mon_thousands_sep' => ',',
+            'mon_decimal_point' => '.'
+        );
+    }
+
+    $pdf->mediabox($width/mm, $height/mm);
+    my $page = $pdf->openpage(2);
+    # create a text
+    my $text = $page->text;
+
+    # add basketgroup number
+    $text->font( $pdf->corefont("Times", -encoding => "utf8"), 6/mm );
+    $text->translate(($width-40)/mm,  ($height-53)/mm);
+    $text->text("".$basketgroup->{'id'});
+    # print the libraryname in the header
+    $text->font( $pdf->corefont("Times", -encoding => "utf8"), 6/mm );
+    $text->translate(30/mm,  ($height-28.5)/mm);
+    $text->text($libraryname);
+    my $pdftable = new PDF::Table();
+    my $abaskets;
+    my $arrbasket;
+    # header of the table
+    my @keys = ('Lot', 'Panier', 'Prix', 'Prix net', 'Taux TVA', 'TVA', 'Remise', 'Total HT', 'Total TTC');
+    for my $bkey (@keys) {
+        push(@$arrbasket, $bkey);
+    }
+    my ($grandtotalrrpgsti, $grandtotalrrpgste, $grandtotalgsti, $grandtotalgste, $grandtotalgstvalue, $grandtotaldiscount);
+    # calculate each basket total
+    push(@$abaskets, $arrbasket);
+    for my $basket (@$hbaskets) {
+        my @gst;
+        $arrbasket = undef;
+        my ($totalrrpgste, $totalrrpgsti, $totalgste, $totalgsti, $totalgstvalue, $totaldiscount);
+        my $ords = $orders->{$basket->{basketno}};
+        my $ordlength = @$ords;
+        foreach my $ord (@$ords) {
+            $totalgste += $ord->{totalgste};
+            $totalgsti += $ord->{totalgsti};
+            $totalgstvalue += $ord->{gstvalue};
+            $totaldiscount += ($ord->{rrpgste} - $ord->{ecostgste} ) * $ord->{quantity};
+            $totalrrpgste += $ord->{rrpgste} * $ord->{quantity};
+            $totalrrpgsti += $ord->{rrpgsti} * $ord->{quantity};
+            push @gst, $ord->{gstrate};
+        }
+        @gst = uniq map { $_ * 100 } @gst;
+        $totalgsti = $num->round($totalgsti);
+        $totalgste = $num->round($totalgste);
+        $grandtotalrrpgste += $totalrrpgste;
+        $grandtotalrrpgsti += $totalrrpgsti;
+        $grandtotalgsti += $totalgsti;
+        $grandtotalgste += $totalgste;
+        $grandtotalgstvalue += $totalgstvalue;
+        $grandtotaldiscount += $totaldiscount;
+        my @gst_string = map{$num->format_price( $_ ) . '%'} @gst;
+        push(@$arrbasket,
+            $basket->{contractname},
+            $basket->{basketname} . ' (No. ' . $basket->{basketno} . ')',
+            $num->format_price($totalrrpgste),
+            $num->format_price($totalrrpgsti),
+            "@gst_string",
+            $num->format_price($totalgstvalue),
+            $num->format_price($totaldiscount),
+            $num->format_price($totalgste),
+            $num->format_price($totalgsti)
+        );
+        push(@$abaskets, $arrbasket);
+    }
+    # now, push total
+    undef $arrbasket;
+    push @$arrbasket,'','Total', $num->format_price($grandtotalrrpgste), $num->format_price($grandtotalrrpgsti), '', $num->format_price($grandtotalgstvalue), $num->format_price($grandtotaldiscount), $num->format_price($grandtotalgste), $num->format_price($grandtotalgsti);
+    push @$abaskets,$arrbasket;
+    # height is width and width is height in this function, as the pdf is in landscape mode for the Tables.
+
+    $pdftable->table($pdf, $page, $abaskets,
+                                    x => 5/mm,
+                                    w => ($width - 10)/mm,
+                                    start_y =>  230/mm,
+                                    next_y  => 230/mm,
+                                    start_h => 230/mm,
+                                    next_h  => 230/mm,
+                                    font       => $pdf->corefont("Times", -encoding => "utf8"),
+                                    font_size => 3/mm,
+                                    padding => 5,
+                                    padding_right => 10,
+                                    background_color_odd  => "lightgray",
+                                    header_props   =>    {
+                                        bg_color   => 'gray',
+                                        repeat     => 1,
+                                    },
+                                    column_props => [
+                                        {
+                                        },
+                                        {
+                                        },
+                                        {
+                                            justify => 'right',
+                                        },
+                                        {
+                                            justify => 'right',
+                                        },
+                                        {
+                                            justify => 'right',
+                                        },
+                                        {
+                                            justify => 'right',
+                                        },
+                                        {
+                                            justify => 'right',
+                                        },
+                                    ],
+    );
+    $pdf->mediabox($height/mm, $width/mm);
+}
+
+sub printhead {
+    my ($pdf, $basketgroup, $bookseller) = @_;
+
+    # get library name
+    my $libraryname = C4::Context->preference("LibraryName");
+    # get branch details
+    my $billingdetails  = GetBranchDetail( $basketgroup->{billingplace} );
+    my $deliverydetails = GetBranchDetail( $basketgroup->{deliveryplace} );
+    my $freedeliveryplace = $basketgroup->{freedeliveryplace};
+    # get the subject
+    my $subject;
+
+    # open 1st page (with the header)
+    my $page = $pdf->openpage(1);
+
+    # create a text
+    my $text = $page->text;
+
+    # print the libraryname in the header
+    $text->font( $pdf->corefont("Times", -encoding => "utf8"), 6/mm );
+    $text->translate(30/mm,  ($height-28.5)/mm);
+    $text->text($libraryname);
+
+    # print order info, on the default PDF
+    $text->font( $pdf->corefont("Times", -encoding => "utf8"), 8/mm );
+    $text->translate(100/mm,  ($height-5-48)/mm);
+    $text->text($basketgroup->{'id'});
+
+    # print the date
+    my $today = C4::Dates->today();
+    $text->translate(130/mm,  ($height-5-48)/mm);
+    $text->text($today);
+
+    $text->font( $pdf->corefont("Times", -encoding => "utf8"), 4/mm );
+
+    # print billing infos
+    $text->translate(100/mm,  ($height-86)/mm);
+    $text->text($libraryname);
+    $text->translate(100/mm,  ($height-97)/mm);
+    $text->text($billingdetails->{branchname});
+    $text->translate(100/mm,  ($height-108.5)/mm);
+    $text->text($billingdetails->{branchphone});
+    $text->translate(100/mm,  ($height-115.5)/mm);
+    $text->text($billingdetails->{branchfax});
+    $text->translate(100/mm,  ($height-122.5)/mm);
+    $text->text($billingdetails->{branchaddress1});
+    $text->translate(100/mm,  ($height-127.5)/mm);
+    $text->text($billingdetails->{branchaddress2});
+    $text->translate(100/mm,  ($height-132.5)/mm);
+    $text->text($billingdetails->{branchaddress3});
+    $text->translate(100/mm,  ($height-137.5)/mm);
+    $text->text(join(' ', $billingdetails->{branchzip}, $billingdetails->{branchcity}, $billingdetails->{branchcountry}));
+    $text->translate(100/mm,  ($height-147.5)/mm);
+    $text->text($billingdetails->{branchemail});
+
+    # print subject
+    $text->translate(100/mm,  ($height-145.5)/mm);
+    $text->text($subject);
+
+    # print bookseller infos
+    $text->translate(100/mm,  ($height-180)/mm);
+    $text->text($bookseller->{name});
+    $text->translate(100/mm,  ($height-185)/mm);
+    $text->text($bookseller->{postal});
+    $text->translate(100/mm,  ($height-190)/mm);
+    $text->text($bookseller->{address1});
+    $text->translate(100/mm,  ($height-195)/mm);
+    $text->text($bookseller->{address2});
+    $text->translate(100/mm,  ($height-200)/mm);
+    $text->text($bookseller->{address3});
+
+    # print delivery infos
+    $text->font( $pdf->corefont("Times-Bold", -encoding => "utf8"), 4/mm );
+    $text->translate(50/mm,  ($height-237)/mm);
+    if ($freedeliveryplace) {
+        my $start = 242;
+        my @fdp = split('\n', $freedeliveryplace);
+        foreach (@fdp) {
+            $text->text($_);
+            $text->translate( 50 / mm, ( $height - $start ) / mm );
+            $start += 5;
+        }
+    } else {
+        $text->text($deliverydetails->{branchaddress1});
+        $text->translate(50/mm,  ($height-242)/mm);
+        $text->text($deliverydetails->{branchaddress2});
+        $text->translate(50/mm,  ($height-247)/mm);
+        $text->text($deliverydetails->{branchaddress3});
+        $text->translate(50/mm,  ($height-252)/mm);
+        $text->text(join(' ', $deliverydetails->{branchzip}, $deliverydetails->{branchcity}, $deliverydetails->{branchcountry}));
+    }
+    $text->translate(50/mm,  ($height-262)/mm);
+    $text->text($basketgroup->{deliverycomment});
+}
+
+sub printfooters {
+        my ($pdf) = @_;
+        for (my $i=1;$i <= $pdf->pages;$i++) {
+        my $page = $pdf->openpage($i);
+        my $text = $page->text;
+        $text->font( $pdf->corefont("Times", -encoding => "utf8"), 3/mm );
+        $text->translate(10/mm,  10/mm);
+        $text->text("Page $i / ".$pdf->pages);
+        }
+}
+
+sub printpdf {
+    my ($basketgroup, $bookseller, $baskets, $orders, $GST) = @_;
+    # open the default PDF that will be used for base (1st page already filled)
+    my $pdf_template = C4::Context->config('intrahtdocs') . '/' . C4::Context->preference('template') . '/pdf/layout3pagesfr.pdf';
+    my $pdf = PDF::API2->open($pdf_template);
+    $pdf->pageLabel( 0, {
+        -style => 'roman',
+    } ); # start with roman numbering
+    # fill the 1st page (basketgroup information)
+    printhead($pdf, $basketgroup, $bookseller);
+    # fill the 2nd page (orders summary)
+    printbaskets($pdf, $basketgroup, $baskets, $bookseller, $GST, $orders);
+    # fill other pages (orders)
+    printorders($pdf, $basketgroup, $baskets, $orders);
+    # print something on each page (usually the footer, but you could also put a header
+    printfooters($pdf);
+    return $pdf->stringify;
+}
+
+1;
diff --git a/koha-tmpl/intranet-tmpl/prog/pdf/layout3pagesfr.odt b/koha-tmpl/intranet-tmpl/prog/pdf/layout3pagesfr.odt
new file mode 100644
index 0000000000000000000000000000000000000000..041c011a100b6bcd2112a907a151dfc25475ae4e
GIT binary patch
literal 13284
zcmch8XIK<T)b1b|B!eUgB01+AM6!}ZKqL>t07IAohAcr4L^4X2EE&llIY-GkO9oM*
zWC4LY=(4(gyL<P$KW;tMLwD7A-#T@=x~fk1LH#~53NZkH0RWt7uirIn=e^DZ001rz
zL=nISVgq(?wFLuhZLJ|7paTR3<#K|Wa>9Uc2%HmU3x=A)K#n$Gr~{`1*u_EpFJ#&~
z%HlMr0Knz(oeb;%<aDvI7MDW&&^m$b;RrejIv!4LI$AIk1T%#|%_ZoxH03#j>7*pF
z#9?M;5D-}Oss#>&DnMEU6bcvpQ6)j=Xb%<ru8SxXXak0eI)FrfRZ8?%Y0>Wu{U~v<
zhCr<(=qwx at Y(=@aoSmIHo%uLn_U2qXA|fJO-)rgqXv!4yr<|>$z4dn~QxF%}8hqJp
zI2R8m57(9KrH21isY}^kRf54_e>Qa4haX-1-W)GCH$T^p>#LT`?M+Rs|CIlw0|;3@
zE^{tZpaYP at 2?BP$O-K8O9e*)6FP-F-buZPB6#uS_IT#AI2Rgv)C6ys2_F%Q|=I7$$
z6rfjzKpkC-bc6+s1o>%ysWh^+hgpI_4qSW!+%`P)cO4<trX0NDT))x%poc&q4iKO<
z2gn}$y%BYwqcyEM%+VSMf&KycUE~MwI{-0MI1rrzOCmZb!okhU!6U56!z+r&{DOa=
z|0*YL3KIPTz{AJEEyTgYa|sX-5ET#+=enx=(Sof#1nK}b<uGxT{2Q%)sr^O#e`>=g
zD!?PkbEVC9)DNK_D6lD_|4?%dkSoX<4432+_(SdA%Ks{C>WH`_h`vjzYw~a_@`<SM
z at ICwu_ov8ZkFSgivapB19bmQ=VA}7Uy(<5~{^uhFcR;Yi9Uvgu at 3+hWXkrcK0Kpug
z4ia>{bUz9qHbC<~3lWd%cS)GZ<$b>ry(+c+Me+)63$zEC+XHPau7r8`|KM<j*_&P!
z@(TS?2(m!PgB-y2f7b8{{!s-*3;|~ghyxgI3j`rF`dyMoNPv#(kFo3sM=+Rz%^*;)
z=?{%BCkP2TC8!yUmgm2T@%}e4zW*l1e<}9IQ!ILE!=G1w-j46ZKPFKO42<tHGGY?`
zGhIiV!NCrfqX>REk at o89JzP{I_M9^U?o_YbA(Kb9bYMez!|Z&G8J4&VAQzjN+zM^{
zb|OJFU`JqPkWw**&JwW&Z*X6ouaJu7k$8f3>vms({aDuBt?N3CEiZZt>}C2TE?%E5
zom9ZwMMJJ-`-&@qjMwyiG+bnp791Jb*2f=JX%=BI at xCIFHwh;p(R8`Cv7)=O`T1VE
z^_i*C?L&vCc(y3b-QzZs9mvix5ou|y7H7=f<aA6LlKHU3;REgUVc284J|pta*j7MZ
zv$ngbkwzDZV$&GM?fh*Y4uYr*M;gw{fko%SVZ^Odg68oZx at B)~mgI>m6uG?9g^t%X
z%#km+>H&6KUOjP5)5fe%P3W~Bk69^fgB>4fN~%_2K71EZcCfN5+_l84xtEw86s;wy
zv7z_EY)`@`=6=R5a0DG*|4HVBH`=HOkS|>Crh6X?esqmConMO!f9&nAckc%I7loZf
zsviS)S9z5BZr^AoY(8qAq5 at A+_23ns#CB3HL}zORC{pU7?-LY!pz$Eh=;rbto{8Za
z^V1TI%?ozNV%%l8ZB5t4*L+qNr%@KTvgGSjsUbeA@~uSkn;Y2<=4!EjdN~N%=htOG
z8j2xQvY3-=|GM2;?46q2%)+<Nrd4ONoSc}%q&46QEcAPG;m9fY%oqmVc)0i;9W50C
zW^?N*lT#jm)8!7a^%H5<7tNAqFkNd>?6_SFv{G*qm_INE<JC(VdipzY)&lCX)=bNo
zF2D}LE>#j5##;}bB)Z71zEW94&bKLw@&>>N1e{->%sjQB=#9N4nWzc5q2hveLWYC`
z77OusuRHa*3QUlBDj!28O&piO-HH~-WWael5h-g`W67pqOC#sa=iGqyh$Y2dJ>Lvp
zQH=LV%H(~|GS)N*8xw}{%h~2wCayC$SXhW(tM=(e39_EEq5w9L5IR>)Ks&Nh3|0IZ
zHS-AM+<W?2!$8f4#?9Z*Hy2VKChPZ&%ti{|otIW-&VMEAB#pu>Vm9067xy{{ha5$h
zo`Cis+{J$R)#JB;&j}MKm}$t5r<t#Nf7a)l4}M;Y-egTqFsAZ2MPv6Zp`$+IItn0_
zgdF=7{e`q-{2QY%qIbL_yw7{a1 at u~8jaQq~;TTa3?KGt27*<C}7w$`MTN>90Ci+O0
z>rA2tHk}3!>msMFd)nGpTJh#htOh-Ky6OFeJ}QBa+)s)xy=6e)6DjC?U^pw4*)Z#t
z(w$154rKKl%%EG(`!nD4IRt|IUb1%rYQ~zL38%_8o|+L(UcW`%-<*dvqN6}gONr(D
zK?uk*l3Cwc-i={%4b$s^TIk3%-#&QVgLYFRysu9Lf$;15a9=<|W_2r7JCXOnuqcI7
z9=>7bx7#Dd<V&pU^{1a{UTBOlyMfAXq-b3uN}9_v7qTTKsq!Bcq?FAjWneOq&65n4
zmoA%wNgBHAF$9<HL6=g&$raUY-N-7ME0J{cetD(qABM>x?6%HhEftwnnRU~1dwz!>
z!nz^w<qsk2(Ze@&>&A|ZffsmQZe!U(-(HSTcNis|y<fwT-*bW)zw>|BzB)D+7HU%i
zew(a2V)I0DAo<ogMe9no*U}AY^uv;_1QK#D7G-LR6~jT5GZQ78_5DH0u_&REN1HT<
zbr;8+ar1E<{+>SD-7WFEthIIV5&pAhpyFEErNOX*M-4|ETb3H>pO at Ru_}nc>zwI#N
zSoz77nssYC7H79_n$v8nLgj<Lm}x^jwr9{QY(!jR)oJ=u+0`N{)mmablU at 8);`iiu
zp~D5{b9e?>vux4BU(7VS96mABb=WET%enFF5N6qkIZMLx25jzMz_(4v!ag=#CrK6&
zC^SBBOFJ*y4s|p1*#D|tRDE_*1R6h01A2T8o!Nc=M1!gyOAMXvjC|?Z2SvpUXB4a8
z5o1R4bu^jAtec$pBi7aNJgs5e?M<nUj4mh86N%A4RDbO#tZdAZJEn|c%5Z^aW?~jq
zEGyVVIHF3Qu=IQe*pP42PWEYAu4A;2%ft+kFHTlj7n#wkD1&9nW#y5S at 7T)HTmZyF
z9~*|7ljS$qZ56Su4EbJ^zHsWa_nJPnSRY9}d3(H*zP>li2eBtS9E?dAbXHu{bgCbG
zd5nF>p>n^#&?x at H$uu#WY$l3{E6QD at fnmNu0xy{=HNysj0mTUv&ks|kYyC)Sa<(qG
zwOhgt9em^7WBFR!wAMF7BU4<%^FKaj;8)DaNu1gm-4117l7HXSA~SY;@^tTApR*oI
zYLv`G%25kr<eLX3-Q%12z1I>vXm4VRv+7rOp`FV#!?urNkDV|0BIl0gG{?P=)bFEX
z2t7yub)f+OVGIDkKd*t<h&2!dL+sWNE(c->+|-+aP74y(&ppK890)=xvlfAvR4BbH
zXHlm$c*alV^k{$(T$-U6l5U-)RyMmyK1Moy>j3n){N|*cZpC}f+D~7^MnvY07s3Y2
z`^^d9jIyk(UzOfYZ<XC__8?G~6oq(HdWMAR^{aV3VQdaRF~!G_3cwhDPpaQ?K{fEv
zGCVY?jIa~^8e1;fO$Aw;GAVqXg{rZXVCo6y48jbU4#*Lk)5?l>SS1R_NtzTdzG2d*
zd&;|YII{~4J3V?-W>C{LlMD;Bh`LQ at IFN)-{&+QFOlRF?zIym`nZ)KhznfJvo(<bm
zgU!Ybjcoy at H%Pv60$Xd9t7e?Wdy5GMD|0;1^aKN#2E*UCj~Iu<yvb!uYbWO+A5~up
zE4EIcyirRwYd9cYTbGhY36v-Z=qx_HfwtK{9puXSKKpacbti9DqoK;;c$VrsE?;J4
z0W65OF1${4wNWMc{- at 8nUo|yUOfk0#{Z3<#QJ3g+<tXN>Icf3ZV);1;=kQZ4iN%Ge
zI2&2B6Hf{&NVm^;0>0c-hN0i?ifVW73+9*3KG+|KqQ9X*+Una&$tc^+W=*;NVl<|P
zyf^hWISN~<v1-5Hkbkob(Y?&D8z&1V?w at LIXwq{suou3%7GEV}#`AK-#V1Y)g_wmF
z=ao$BvsZ^EYLSC^lMalxWbw7l^N9TmHPs3i=TEu>K=0Wx2lh*ZqN48>I=(J^0_kP0
z!1paWPsKk)L2Wf(+kZUOfK?nJNm-+&OG^Cu7C%!{;?ew_3Hub#%EXJ3_=qvkP3(g*
zEaeOibD(|NQ+Z!x0M`9Lj6GCY<#%}b<~|JX?Cj$y{i`fZDd#C-Gcz at FYGMxq-J87_
z*LzukuVWq3_yeG&o%z`Ij2!`JV*&>+6SH2_pBa3apHdEpfbO*S9G3amOPu<eya&<=
zFt8%4L5#=3w;}|I%ki|cPVss^VeIlX+oRyTpVD(X+bl2Z*VaX5W4=#k$iqs)IUU`}
zM-(=71|8>eiSkXAyHf}s*uJRu%SSllRt+;El7?36z^o%vO1*w<fAVAB;@lisR!WLM
z>ELG$!!r=)6NUCW__%)8U&sdgPT}5cpL*ak*yuV^d=d5FRcJe4$tR*jC+MrwOzOZ?
zULBjAp6_N-PWDM`m1lg6lusZZ%&YVbYmY(2F2 at _s{(@PCH8H0Hmv>nj%50%Nrd7A)
zBB#B1lq9}Pp{wCGE^(B+Z4dY8D=;{Sed2T`Sz at D5aO9lmk%*{(IljAyH3)IWt9e}&
z;Hc-v<nLeC(p!NwduBu86lr2ulNkkzGeO at x7sM>*3R=a>JMPX<4k&KD9k6643AhGl
zu%c1VJun1O8<P{?B)LZt`25v;zlGxbh;q+J8qSTD?u>bUp5FGuwDIGwymfcA_k^3J
zYfX|Qyj4o+DX?y^-<%mj at +E1j^_=){otL*8&|9}Y!?rUvnfLkFcN)7?bLrt5ejHf1
z&xoIER=5gNK0cq8DAzW*7W#pvO_R*hQRuRU-NYmH1{a${eb1b#7c{<+#kHpSjT1-<
ztrqO`XLLOz4+X at 7Dg)yBlGErYP(Et2>#-4r?&}1aqICPR6cBvt#U9Es9#eXY(uF=0
z1UGF55vKSEfP>|N<uz9anxE=4S}@C*o(v2z=jpO(R4lLP&+NC7JYBmUjSjl?M%)y0
zK~mZ$-Zi`Yk$JPC`&X58mT)@x>)O67qo7F7VitQho+;=i$9+L=;wF_H<4pUFM~Sio
z>9QD(NCwv at +tETHaj_f$a?HEVmNrg_rR>V)SlNN(_0n{M!S>f`m9L`?>~7k=c88HY
zyQ>0g4JLAay&>A*Rz1!BWi^q>HOe!q#4g92LsiRCH at O#I=^Hz5>}j~F;#{k#$jkaW
zH&8QI9eAZ(RrMC+W;h&lryUs6Or%^#wj7=~m7+Df&kfofg@)QM^c1wA&wL}FLcJzE
zjx4<uy;EHzX-*5BFFPeN;l<cU{_t8Vkv(Qe$$jE|Q!AGoantqI<D~|#7{Kf;S|8KL
zl4{u=>BC9V8!#v8oY}d|p^T7Vay|8aRSc^ywi<RqTCNYYyn7wNxD)3E9uVjA0A!ir
zzFY#)Se8S#XyXXyljreatmVTwuGeSQ)`j>!wMC<GY}3p{l~-DQo=T8{JvpC!sN&Qy
z9sN9SdGirn+<Q!B$uI8x;znMlUG*Lz9Yv0_Y6VB}_2Vvwccwp<C8EA!mb*FO=sPj4
zRJ}c`#^@#g#Z%!zyg72yyr|+9G|{eObaUCJjCu~(sVqrQC#G9bW*RqkjCuP;fCHJ+
zbBFiY152=r#>e|RX^)v)+)jauOw6f{?uQK^##*!_5kIu}_Yyt+XOM^*wHGC(g?+WN
zulWiq7UIVBB=?||o-WR!jUUfUZJ=|hI(3JHw<}yrO9issMTMqs%QF!^WcX?<19OfE
zh?%k32Grm=Kb=E|Pg*4!CN_xIxWmsD7B^0MtyXtu{Ml9)Ke+B}t&JX!9#8u3yKTqp
zpCj!(b!`+k_GAdwJE0Zzy4Mi(QEk+#-uXo8a=9LE`%vtJ4gg#TT`kvFFA+l?C-soy
z0sxl>8DhECv~aXBfdV1ca4v_dQ%+l`d4RgA0uB}h7D5C^Nl{h<@%J47fCRv}hB$MR
zP6<Yo&nwAFYq}(C&S1Jn98h)atac`fs|=+>u-~od;JFP%r$yyfc427|=h3R)N#K??
zhWDII$tL!6np$^_NrRP9#MMoUuza95o4Z+4B5z>Jv7!cML{jrZ3d*aJN$_P`=ROWA
z5}kN7q<Fj%SGovSd%di*>qRf#&j*;39-2XZ`t-TvQ=k8w>5A~8!DnK)m6G+_(@nk?
z=Z%#8KA}(b1h$O+jfJijuNGyP2x9}8t9~E9(hCXe1n}?qp87tpP^YFdl9=s57A{T7
z4Fa~^%vU7f0J!~au}6!&G#u`ScMi$A-zL-ddx=Ylv`TRa86Dqtdusft#WAy%N6>36
z?B3jzVQt5t2FRgXRs(gN|A`#dOU+KXwYL`~BLa51@?6g*Ah1FX-M;i?6>{<$uHCI)
z&&1dkiB5bw&xri9fE{nw&vzDc^wHs7(oh#XmuE8E`?rGnf^&q`$MzS at Gb6oOc}U4q
z9qy+eXoY(2P*nKlbG}_Y7OYCL;hE&Ok9pUUuNpQS;F?wCS0y5qVLhG_teBJhe9_LK
z=-&Fvh)e=inwA%54mn8dWGBXVhZxniz6qL42!;06m at MG+8!lP5Wa4grtNsGKz>y_{
zZ`XE+U3}dpL^e?0N18$N0HFToET>2lE5htzkaZ?xe4b+LaCSIX1nM)$fD1`PY|ZTL
zM=+VO$59tnj_GbaKck@%?Mzqc3TQslu_bh=`&>5G%a<i|bflYCjk))Fj8xp<ONFCz
z!THg=4UGE8MboW9D;>H)<`CpDEvYB_tz+9Yy{_!QUyuC$TUN=_iXd}F!%`*;;cKVd
z<a+&+CM~As>$NZMVOkxXkTKG)Z_#(+f at 6o;gRBDa7;!?NS{9EL;599qMEA+%Tm6*c
zYj at tHX_*<B6ejKLyi8##3KM&zHEQVUGCBP)+CWFAVQrBBn=5gb%^UgI)2C<sNT~fr
zZsF at +zpaFIvnxFqDi4o6ug;G5KR6s;9j0x>*to50^q{g_GzqpuWlkA2h|DPd&e$^H
zLxapS0Buni<7O;*i_~oWL*fjO)wDn-3!3$O<t at xwT?J+Ge(oivgA}|shw7D+$iLY>
zgKb)kh<B_0?Zr4{+lIg379Nd%h1&=9>Y}s#khQaIVz#Z<FV)4ZW;0*R6((4GFkCya
z=x==Dx#+$c!nGY6#*r)Zl+#A)tVo}SzOAu7S*uc4m-=;FmzU1x{rAmx#pyW8vuDYw
z%g^=~y&d0*HS~P?Cg$1lh{+uHuw{T2FfWfwypQyk?Cnuoaemy8f1~&Pb}!g8fz91~
z04^f0rwh%MU(PWQIE#`l6i-gw-xf}Ng0TVW`P2l1NzUk27v3WvWy;k%su{0J*oo?g
z*^E!BRaAFpg&O6Xj}^E&kF>gm<-6w{2CTj<77-A}+-R|pwBk>)St;vOvRtom@~0Dp
z8%NsIbT5O%gR8?zQcG02`SfGUGTNH>CK4#hPz<ex>PyQvYaNW2PWFsuI<O>O9+7ZT
zv>S+eo at MxXu@gw%`J{bbqjevh*ji_~;{LP7r*kKF2qqMEmLDiE^-{hPTuTz}8L_=h
zG~sW^u{T9g at 9w(g5kd}<DUZ(Na$9(rs at pSZ+kyZDwWZM{eEv|bFy^E!&Yn?KGTVeV
zdg5$>4?sEOv1>Wpo167qT5S64Nr8hxAufp;*eL1#v94c*i~8WBk-xu=Q;)}o)2z|7
zLXU0xm7GI1#!|S at hSdA(RhA|gJ?5mgD290D!_kp>aJ{au#F^UN`Kssbr|A8YSrivX
z=8KYs_2rCaW`m#- at cmp^vf%uDbU&q)B~9ErA=tT(yXyg|IUZ?WegEquqMf#y!o;N0
z<Duurg;VZK4c3snJSV#f6>8T}cc+pUr$#J2xI5cY<n`#@9`0pfl#-0Dqsda0EUg{9
zsx=+q0*oAd?~E$7)`e}vG{DsKLyS!8;>k%;qaW+Jkx-^NK^z at wb_wZy*-;(z*%IRB
z;ruj0A_-7KlH`<9uP2f<*zv0}+%Z}e1QQ(-B9qr6>Oh+ns$?hHZME3gL|hx!JuDVT
zviwxpW(78L561K2zV+VbPBysHbSADofd2oIQ4V(szdg`8-s2sDD|8qp?YDVaoIU5z
zTW`<vbmEqbc#?)cp%5$ov2=8U^Xud(Vc5Ox^1zXhO=LcCqgaNsZ=&L#%n;Lwt^u8@
zeOa^MC#MV@{fF+{5Q}X-vsr7?P255+1&kRbV;Z7!SKwg^W<#ZmZEC}FWF)jOHE+aP
zH*|2O;2M8VPzbk5%D|&HOdnnHN!yf4X1Y#*sN+|FfItfljP>z at XkjLy-5Tx1keZ--
z52>j<JW<tbcDgdfyd>WrKK{I=X6gzD-48naRO(Nksh}I?QG7HPo#3;uNOY>YRywr5
zNV90P!eubwHL|YYRB&3<P&=EGH?!A#`uHLBTIovutXKa{D~w!-ufBN~C1{VPR-kpd
z^7P%fHpj#ytUa47)bVv4ou6XvG96Ai(XBYCTzA-}Sf-e#XkNL6NW?24FiMT%;Ef<d
zmZ<oO{OmfLE at RhtG0!bwRVbHH%|3=RtV!6fN4q#RTX)OBu~LFEdfYc~5?&*jEowYl
zRw=&Jq(@<thaFW>O_c6<kQJQol*K<ZFIe8WQNLWvayt!qm2u4POaZ(-S5Z+_+&j*u
ze~S<j@$l60sDz4owqfbCsq+mVh!r=om`;0XK~95{?j8|EMs}h7e$aR&gSF%1I#qJB
zJ(h#1!~T5Sw<BqnE1}$Gg7TJzVl8`?-AIC9$H9ULQA=D)`|I0zBWb0TkE8T6H0<od
zMtk1g)nZjrC>{Ll#6uCKItv6hFSV`qO+`WMbcc5i`=UleA36#q>tv{|*M8YL=c>{e
zKcvxW<PKdb>^IsQi4Rh+AUA94KBxNNNbpMVcu1kuKXbY7t0hlZmE}U8lG??|I-hIr
zrm|*Vi?d&84>DeVwYx*#@E)9#WA%J at t^bYDera53gWcD`7q8yDn&|K(r&2f2A6n_i
z3jFFH&3V|N=o9!g(@t%6IXTG0adK~KuV3yA at Z}pS^C#s0ny;N2Ki+_+Dd2xQ?s_>_
z=k at S3HRQCV14yHeq|lgOjeRQgE<yZD%#2u at o2!)`^ON2C5n^;+<qKy*YP?kWPAnBU
zMQ{3;KrNo%zG%)A5XNjbV?Dh1x?E<u<z*y}63DqR$G=A{({}$f4*%Km2zgLT=TTR+
zSk8i!er#ny^=78;^t)uigaXN2FZz5My^`XQ{ZXtJw<{fNE;8 at OsMf9d9<Xt7ak{Jx
z4ZRk?!#L#`nE676^j|yos~Nt!Bdh!FH|;eED)D0Yosy=c;QeF9_>9;eq7-hQPQ7TH
zqjAAxBr|9@&cNm3n3!GNB35aBpHN?NQCtA-_|Q at 3r7NM!wxJ;HOgN#?N&WbcG7TC%
zmVYt&HLiQMx5~L0AhVvj1l&PO{&VuUNzzMK at dzQ8ljC7JHd}j)o!Q=bCg%Rt8*^hR
z)OtJAW_r!_vHy4nUl%t+TKIJQ)Dv?Ss at lrTuf{_Iv*zrCoXSoc;R5$sgl(WI_JK%v
z&!2 at hzGXicWXK_nX}>USzi&iU6<+0r<U=(pg+}b{vEi|U>N!>j8$JnE2%9*~JY12T
z(`_4d|CZ3Q5TqD#?1pAAt6B1f-A)y1y1G_t=R8R5aTwmZ-_2G@!5Z)Ir~uE?@hqvq
z;%;I*X at e&4Md+b6^-}1;qw3x)RjtH_`$4bnN9m_GIo%ZyK9R*qTb{Ik*SgL<TJBa^
z#Qp2mHfLoy6jb9xJz<&0UeM*a?dMrzsQabl$;QMdU-XWW8cBg_vHnq)wOF^U>C#hA
zF{w&UltZ9E+;pp509{ZE)1!N>>`RLzgUF|BW%l1Ux#KK2oT>|uV&|e%3Y?a}NP?Hv
z4@*^UJ3kitu(mIp80$Qh|531lbG<w_Bss*h-FR~5lT!i&M=d}^-{$^`*uw^wg6B>&
zEh%A8x}q?>WF7l;=j7K%UIu6}d-0Q`HyAg`?9Qi`nQo|fF7D<iHKU=O`(-8Ek*4|o
zmz%zI-XR!5cRC+}&!7Kq9_(MoKH~fWl}yl%A|KE#fN=Q$N^+{Q1$T{o{`u|i<rh$E
zpexJ~@#z@|vH*ijjZK;7LB_ at y^QOke0jRu)H^=B0tnL~ygb2yY<KMY#fKZ4T81BGn
zZ)(;X(FA?QjW4_H?g#EOPKoikCPKWT|ITQhB0>k1YnPMZn}-2Y?wgyrti7on24QBi
z7Aw7n!nhkUV*JKdNm=CPQ>>qYXU5$#C0&=N8K)`>3Js^I_AG;<k}W-HU$fqd1}nw*
z6MryV20sqW!<T#MBIom#!Bv^Py*7Xhn>t^9rAJmW#G`i?$1K+sKY^i4RkT(lgj+15
zAx%_0)<^akrt;Kt<)CXPv&<a3W%y}~ESX0hAADXb*aQUOa}<<#b%S``;u0ojq`@5<
zs{H(o1T>60mojGe8|dirpS4Tj8#>jldZex|WknqIT|bep4stts{sd=Csw7eSTtQ%v
z>C$p%5^t*z9ys6`@|ESToO*;Q|4bB!GZ`4v3}XIAbOM~0%NAzqXp4x5apd}8 at xQ~-
z{0;7VbOD^}F2unGXbb-r at ZUA+0E1cE0-<2*|0V7+?7<Ok0<`}Z+|9pH77^}ZZV!h4
zUyzsYJbpLNrKbPh-ru1v?fJh)nOVaSfihQp`@2Ab%kZw>H3Wh{h?u7D at jqN3M|=A}
zKCmEvf1(ibfXlZsm+7CMsLMAwa0gdJbjy$E1eLI9LHxR-M`T!2lpNDF at dYy*hXZdc
zyiri6%Eq5YGslO}W6^^rj}H=W$pyS(C_KE~^bx-?Vd0D2$KLBon>EQ{k443}b1L6&
z`>ePV^yp9r#IDxV%qNF6yqun2J>8xSpkE-EZlz=8i?({R&jPkYi-5l?Zmvm*JeF5)
z8)eKQe at IDXBim#z1X;3z^=LS?lEsV8FrStRh^^&BJgDG{fo2t2N1ja<r;m<wW at Aep
zWHFhnEvMa6qEn<V at v)qhu~T+EKjxgUGO%tg%FT6k6d<)H<s4skv`EL9&mLsE7e|pV
zjP<z7mWPCMwR_;RneuSXSM_oK$e79K&d!3=*GY0(R8A4(b`v3$j8hLq;wa^-C}-cg
zxVaRXctPb4Jn0!L7SQouUr5%%s%T4dtWu#JS}&K|mTh!xyz24acn1<$`%qNAZCeyA
zYmnGnd*jAXWj6FMj5Ak(KZGJI$of4brQ*8uvm)f75y<@y``Ih;>Lqs-X8=l>q|9IX
za+M0}`i6G)@8&$5=@h2cL=}E?E1d#A at uu+GS%<ZL at I|3a+K9St4x2<-dq>0FNCI}d
z at K(pD1J+a4N at uV*fqF9$1rK2<v)0kJ^@%_W-zjCH18MDQcz3uSUGiBky_yd>eZp|B
zi(56eXNsS?)B(w+1@}5x2c~I<y*j{9@#SD`+5=lE>5n(Fm(8XZ9Bla?MHG3 at qFCfE
z-jhI|D%_Adfw_`LXYrv9DM6wod|7T{+e<+8Dq5&ZeWM{W1BojXOR7UA{b`M##~PGw
zd1q?Cg#q*?51W_?`~>;CQJdzPuAk1xZ$j8vuVJ%gcJ6TM^c23aR(Dy$6d(p&s|zB~
z8o&@`n#AsGXiTyQ%zZl@)P>$kn)vo^iP}52Oi|;~!$(-B*_E?IPi`n#<chlyYicZs
z&e>`Ep7=)V&Qmm!Q}Y3}Ai5hldX0?}_vBOi*>Lm+RDIfR6ocuWf6k$In_fWg2R$dj
z?YBNRyQ%0;V0m5r4lx!cKW at zfg%9R6EF{Q6%Vb)mF7z5mSpbgv%tnpGeA!<~?^NrP
zOa*7~&qX<)%LMQvzhs7Uc;hyljanx|J~1!zMO1l1aolQT<5AW`+wNAx&Jl-rCAc!3
z*^7%ls0)u+rla8wTn&t*qMA<{lovHFe at WhwuP25n#DE<yj6#ZuS}>g)DABDFb(<vw
z^d(LjG{n0?4s+su=`0tgP+f+`lb^cXICcvSk7$@6u=VB;Ux!=@>J0mI-e-*pfLA%o
z9*U>yOUiXUqX?hM%ruRPT`%zK*M5{G2Kpx%?>FEfRriLNQcTHLM4BGH11+p6=P-}f
zXYB?n7o#&2rf2jpy{v1n at oR0pGbYV|j+IfSuK0PCQ#n1`EvQA2OHPVU8=u2Td3(pl
zm*wj~^SMv-q?gRyHqG`XiwxU^`#Bl_ypo*WeE5?FK8hzw5|+4VuWO{ppT7bvo?y`c
z=Z7tKAZ&}n_<8=8y7COfH*Ft#+Z?%pr=Vi>B)Ur(NTR#;T0y~KDq?*qVwn&*wYAhm
zUJVgtx&y2Z$9M^~?lWoRuwEelkj5%f*L6Q6R`|=I2-560E>B#Xq?-%fgNd~>M*|K?
zC1KdsDuc@?SdQ1~+?0boQ$OOL`JAIizLMl^n-ZtE&$IW!EZL<ePD6mBQL!hku at 1n|
zJ`7E#oaQ;Dd%vKAdlVM5wTTgO-}3Xsaueq#71;7S at 6Mf5<j~0u(qL+#Lr(c^zq>nh
z`)4mW at FG@8i$HS_wDs$`y(gk`&o{!H#&0{%TBXZSddU}3IetkinV~*=SpN*5V2ql)
zwh?@BFT>TI&V|B9j!l@^@odjt#E7SUTE=QNkbf&Zg+%yTXh1x%09M4({#%b{UV+<B
z-c>Ex>C6dBM@|_Q_un`lzUPx<(uK>OKblWz2iPqTQHdgN8aKo$u)G!&lASb_<<!2j
zSb?haWL>wX5E|pSeN)eau3(g{&GF!#ok4?!zEC0Y`1GT|^$x^w7`3R2DC%yjKp!JH
zwt%O``DjNoxjz~k at 0Gu^h8uyAx^sm81w7-vxp(B9$?zr at eMVLeE49)iK?r7jesj8b
zhX8l8s^3^eCf+xEWrysJ<n at 6#g|IS==h5U6u!%6Vk8;L!&}3r&+J}^oy6_U&ao!|_
zA@`H^*PlE at dB&!=7{A^_7Ic+OXiOw>!nbkr`Q$Wp=1- at GhJ3FsBK)PMcsp0y+ctL_
z=S7s$lNV*W{d0yBpgN37b)s7$8-8O=HwbZ=^q)Ku;U24-iesC5?^q}lY$!$<DbQN1
zFf)6E(XIGu5L7Bw`=ugz&=R!`%e>FcoX3bAHZ7-*`-%fujm%@@F=sTgD1Vdx^sOkt
z+co{U{Ou7%8GZ~wR59VBoccm at 6>8}p2~K*OzhQsdW|HxCj-P3f0N5d74vwA*xj?fs
zK8Y|{Ny}@2(jMni%ibq7BJ}8?j;R~@6o==3!Tssn>vCrXC2W<rhxpv0L;r6pFbQG>
zR*}<`=1@|V=lXMVi-?oR*SrsHp~atBCB8A;HDIQdD*RY>4RZ)t`OAc~Pm|BBK$wx3
zrKDC=mv$-0bGr_RrX3&Q+(rN@@n+p&G?Mc+y=#+`- at 3Y$=1v-aV6x(E{Vd>MMg6*C
zWPurjJv|leWICoeW3RkFZVoQv6Z$c!y at R;VmNS?-fd_9YcLc_OA|oB=(KDv2UASM>
zF%K}7KOXAnF;{ID5e_)^QOw^`p~{IiZ`w7?G8HdYhx5CbhRZy`6IQq*@Z8*+(UjUO
zJPFtO+RnskshzX`#u3UGLt9MRMz+Tt6N$3y_OI+W&^_MkQ*fgva4*#{yg2Kz^E@@p
zi^n9E8SCEYo<g&<j$b0D;~*h>hKtT83$_pT!u#Z<Pn0a*#eXk+@*X^l8!@Lj3p)lp
zS{oNCJ->Eo at 9^fkUpNpu;Z&4Mdm~*V2K;lB{N=9bXS#}+{~h&vIQ&n93gYxK^z(Ap
zbcMRww*49vbLsv3Os^1O^}j}g{*L_h1KnlR%+C~!Ao?YS<_dVVW&i#A-A|w#!Uq5J
zHSdb$O7UNvu)iuEN%vPL?sw#`PRL)8^9bahqZ;9|T_LYD|EVbeaOp4nOcaR6=Jy@%
zuP)19Z}3kX;=dPuy#Q$Z4bT5 at Vg8xyuS$je4cV_Q&41<T_#2*IU7UaBxpZ=Vri;Jf
z`K!zG&rFx@%g-c&h~fI(+&^8Q|H=aU8<w9g(SK#h_#2j=F47N{t3i9&gDXGh(n<Q6
zrvHZJA6%xZQF%rB>(qVeBK=IfjK4ZezvF(Lf-WcapQ()FAEtTr`>2Qry302ogn(QW
L0DzwB^6LKp1SPX^

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/pdf/layout3pagesfr.pdf b/koha-tmpl/intranet-tmpl/prog/pdf/layout3pagesfr.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..07e70577ab6613ee1d9d67af409b03f0e8b3a40d
GIT binary patch
literal 24394
zcma&N1CS<BuqN6)t!Yi$?w+=7+qP}~ZQHhO+qS1|+cw|K-Fx@$i`^IdDx&HnPF6)_
ze0kzT)tAI_LL$`kG)z#$1BC;f1I+_DPz?BV__hWXP+VNJQpPr>j%N6be=Q2MBIZ_(
z#tyV1R{D;{LdJ%+M#elmPyj~<V|{BV*UT&x$%qX)nC at fM7p>HVyLCFyqdG;k6a95R
zTnSsRIw`2liLcLb1w;=9P8l)+0*42$_^LnQ#?X6Buat$cFD3=nNk75Y at O8YIbhpBI
zKVWN8bf>;HeCJPg2^%#sdm^4m;d2LHkC&?gPZbm-=gX*htspc{3sdseTMtk>V1Hdh
z^}bC^aQ8TEPsdCRw7FSi3rWbk$>>5~Dp{61u)oUUnc>#B^6q_7 at p)QRT6WoKw1_-J
zLDfeEI3eW3J)_FKJwz?$IYIyY1uP7tRv6;nxhK7_rj~gwHm#E7EoA4*;V)1agacCe
z%)#x!=r+}%mYNTvY>TCLr=x*p$we}6s<)|G<oJ%L at tlI-w3M<_-ZKl%s-)|G{zbPy
z7NA;|3sgg94%~IlU1nFbF=k4(Q18F$LA4mDeS;UFoQno;*aqc^LyuC~ON*bop#sfJ
z*{tIeR6{i0rMwh{wbS+GwFm?tYKbdHiVJ#c9rx-Sps8wyb+)$J7k(ce&T at adu}<N<
z(VS#BWHj7DidFOHQo3DwZJ7;8{B`JPR2&j5Qei~4##X}VC-fW0;RZ_ at nn@Ugw5=B!
zJZHI+ at 0$y*Ih^UCB%MIpv}K2!MurXsuz9;3pKT7*zcT>7G<uH-8cO8sp<Qi3B9X6V
zl6FzL0|_T5D%pxMg9|p;)|-6{e-&4nOYhznAA<xP5(?tIRR9h|D!c8*ri?O$6m{2e
zglWj{ML}y~43B}R at 8zH|kad^tP^PT%C|xDevZ_A>Vx!1Y<qP|w<)I- at fhrwP<z4|1
zmPZ1luIw9<uNq$$&1>2c&SQw?zUB1w2*iHeLh|u#t)LI+M(782p}e9IEkD at WRegX7
zy*fI9QQ@#7J26D%40kpZ1v7-fza*V9F%L)?u|Wa{iUOU({UPVhI6KA<SWLSQ_jk2X
zitNW4`CfZSFy1Fz`I!uxfa+)h8=ba0_hHit`VBOM5RDFHY-9AFVE-%qs}HDuW${m7
zWn}y3{SO=S|5iLK|38YyTCUGxfDWeXoYIkIp#hoGz8Afo8slJTX-06>T2t~AYKpjr
zcU1;GQvYM--Xs3A5 at i<#ZlScOzDhZAI at W>BtKUB0Ie#pD`Ucw%6H#<CzMRf`XTDb~
z^7j1Tlvzy{rz?=!qnz={ud7(;jDSs6kU~9Tt+0SF4l>EH{lWy1j0YoiCaeePfUroj
zbzGu_jU&x;nPh}S*I+E at nN0vsAA*w#@^w3qc>9Z5G|M<f%oWT=(@Lt!;sboWG-;z2
z-V~btbpNY%=!J6^9F6TD<O3*&L0aYikh6c;_?IXKde;A$Gq(RNXYBtUIs4BAi5{Px
zg`SD&e_ehyJuLY&N77CvGXW3aI9)-3g+#vue1Y^QIz6oby<CBH^ej6-EMn-jeQ>?L
zy5d*~OkqfwgEITYV^4=B^9$ygYR((Ot5?!y=f#`Nt1nx>*N+xkH?3N_qRtzo0rPC3
z?^AKTY|<Sr&s(~xCz<zCtlOT9_fya5>;?{=*Z2&%<b(KaJ}%oUvfsOt%LoFz{690^
zpQWKl53&e*Q{V~9tqs>*jzx98aRer75EKCGE;t)c{RurM!eY-f0(~yQ;P2oPSh`fg
zW~W%a1)e|QI}#uke+pO1P2;R_yX|C<Jb9C;3cN;ih`hf?_c&g;k at dhFE^T^23>UZc
z7{Y5LLmTTC+CJ~3;~{$j9dZORWsHcBlJtZ)9K&na`!B^r!9`zk0R8|an(BF;1BL9y
zc*6jdo2AiFl_*#?a&!?8&5veKt7L5MPCB$TaO>pk{6PSKxSf3O!@0oK=gHd;GZbGh
zd!;IpL1zh at UEyf7JIhvQz2AHvk}-|rWYpn#;eBF=((&i?qb@{&&yc+#rw_*sEvWTd
z=3UL7z?S0iKkGe`0*1UZLl}JpTLhlXAAY<Yk|JL5|H*f$xdyR=%N3m=4<CW;J!kvE
z)ro-cg*fa)wbA4WLs<oGDX_!weYf$SU!l~a=M~f(Z8)%YgyBxZ)g^I<2sqj^LEoJ>
z2cIgvq)p8Zkw2Mnc7)#qu1bPyxhq(Xb-s$}wS;~9g`YkneUcr7il<iuClYdmYR5_y
zY43~OhngAE9m&JzlnI$5C{}%ac420_-kRs+HPPNQWtpBI1^eh!VQG1Arc9|SHc>%A
zIX;n`7%UkcaTnm`r$s+<4bYJ8q-PYYnYUP=h&I-17Jf7k)Dk-wLbA$6k3yZVUx5hi
z77le408$!wWP&89j)h!S9OrAhG)!~|SJ25F?5zD!MMi^oCQNWEkVTd`vWdk3++8Ab
zfryxb;+plN!A*hy1j?JY5&kSo&`IFONYI<mKzH8hn=8%@XTfq6sw&)Bc*G1w7A_w*
zUzn%;1<bT=5Q^`?GA*xQEJ=WKhTe}yFOaY$*sMn<o1UJE)>85~@+ER*v!;HAJdG?l
zN~$1z4o62JHbo{zuV*)0>!=VIkUhTb<Y~}(2<wuxx6{)BNJTPv{3T*28_#t}Mm#Cx
zFsH{b_`|hM`@EbZOYJ>Sv>jpnH`$-XL^|Hb?ozs#1yDCW0?1ZCw=%M<p#lSrp6%Bk
z8w)D(J42_8-~$h8++yfW&H@$pfN#6OEVI at Q%D$11o4W at iEEX10Dl8Tk60ux<^fM3`
z&kA9mqIKJ|^b+$=%f+9dz<WSxZ=a5PqSF&*l*ovRSR9JRz}8MV!VYW;N%-~}jEuU5
z=ef*^_sq~!`-GJy0L^1Ze^@5i&`11zBCoKrs$5yl6NOMu!h5e4-AtB at z;e430m|Oe
zbnxIH&=d#*Ka~h9-{KjP`A&sVPu|DYi{M{(QYLv4pe%{9U21r;KF_f1etvRViJ`#?
zlG|HpvFAXs?{k()KE+Hh)NgyWLIY0Ycf|dBYW);TG?k<{DxY?mC3C+wsr0q8_-?-(
zD}-9Rqo1f2WJk^w1amtFVYB|^j&2k&PJliuA~eD{Ey^3bTg+5+zMW3{Swre>a04Yb
zOP at HtBRQZ^*`=(ouLz^S{#LSsY`>@ECK)|@nm%Hwa}#tiHFn1 at gBp*9UGRyFS~-=e
z15T1O`+=F4(3(bre*jFt1cbj-?du_cGt)a1(2GK)ytsxUK<ZrJW`Qn}&sU09DLFrT
z=Oo2mE>lr(zoFFl(^Exs^NYskOi at cHS3}GNhMGyKboP~k1SlKG4s?Z#j6#xh(JfCA
z8 at XeUfPkRId9F?VmP|ngS}@Mdy=tw7k{S^;6!JCCy_+v6&Fp6z8Z_%{X(C$qY>YDN
zlq&Q*W?h?gIs at 7~3_ at flxnC*NL=s7h!RJEuP%sajL9N+PcFCVnhNeRTi{^QQ`QFBr
zr8a>)aJW13=cq<nMvLL8%cddWok@#7p)b?0rbeEonl8tTT!nHj%`Vx*sg=>o&RJtY
z?bD{9p(s$va#X@|{(R7h^CDzs$nMXK3<8Q0)D`%N4&QE($eAX%A at bjD@%^{=Y(Lmo
zf)Y@$KYJ<IL->Ywdd`D at +j(-%Fw>)5<Z(ouV}E+u|A?sI<Jc=_Of7|h%wki^n2BgY
z)|I|pB<~F0Tg=5+iH?Y{$viqA;$@FW+6g@~3q0V!-&Zb(XG9ND%~WnUxtn98xQaqC
z#rT2GF(AhzI%~Q}@i80Tkh(`i(nG$(`g$H3J2?bL64DwChgV~0KJ6>dee;QNpyuAF
zK_jw>Z93YT=ob_ at 2g7biWk?c`F)r2{5N50wPUx;IHGoeuoGSl#SadVQ&CTsGEPYgd
zb4XkS95SV=q7Rk)YHgw5XyN=^rg-qB2vW^#sdb^_qL`q0+VF#*IqQ`NafX*GfC+$R
z9FrWwllZE3#F!>kthZB;R*7r*7)51!7#6|H%S!Zo&XCWQlaLX>daTDXk}g<I0<f8A
zi at kUFwVoazZXTT}r~%kx56hHfzdo|-#^y=}{E%Q|w_<~!ohY9mR3DuUt$)2pyNFn|
zYAzWvb-a1IKuw{ZH`xqj!&MfgQ5}d(?r*efg#hAc;@+>jz10EI3(nihp6KF^llv1t
z2d^_El<Xchm6(24&qXh4t&z&ZbFSG?*U(C#le3&bWn){Z-QlcQ?>d3nnQ?k_51P^9
zEP8*zn%UGOgJ^R-l~yI+3zylX#1nfRZ`u|T7b-gjh+=P at jbX=ID$S(GH+}%-a$)xU
z14aWH%4zreCJ4w7W~T+ at 8f;Wr&XudT5uz5kHwK~`2Y-Zo1smV07Zd;cW50J1$nCcs
z4d25|Y$r}{Vs;}0I2q-~I#4&fD?8tjX7G<xuy{NO9k>scUTionMEtzoqh9HmWMy<6
z$Vqt>PQ_Aq#|N<7F3cTIV3+}HZ`#H8BOs*MeUMo at p!t3o;~6bJo9jpw2s(OjPd_z1
zCOa}aj@<Hg#9rXGZgO{e-yCQ?WY;q_U(izUg<y$%+PPn{pf`Cy(GbNyuII|$^)76-
zP8i&=(jo{^hqP)|_F4%3xDOjQHjj&JjfA)b=gb)>UA~FOoHI}{Dr+G{2YMv;Q-lyH
z>$lH%2<-3g6R4f9WY6FNos`c%;>q$$@RL8$_~+FYGKoAI#t2hYkZCrD%Qe}p4C+Cm
z0vN&|M6C=Y=(`=SyC&YQPU}M=?iu)xy?%N08hc)~g_zJ<8=jp71bpV4>yF!5Jk8lu
z&34t->{jQgb1p(#d{YCi=}h}fq{w`);w7*4ZuLP-ep%jR!I;FMAW&NvO{oB?(`GZK
z_*q;vZv<k?y5T+9#r*MmO3GD4P8De;;e=_y`shIq^|;uOI?)fh5eFUMO<Bj=RW^lj
z3ILU?cVCa0I8<E5kaV1}kSMU|eg+_t5+3db+}tba;)9up@#)Q3nkoV(nbs<_$f^iO
z7x6f{+pKRlH*-at-7L3DKC<05 at Dvdd<J=rsC7q?M3UoWmaG5=ABHgcPAn!R}i66(?
z&tA@!=BG=4o~*lk^iJpe-e)^|^xjhO2uR=Jt;XsNqi{^sYlr>Ww}z2K0Nz*H?1Gk|
z7B-4Kl_VBT6T+nF9Y*R*SN(x5W7R5XNG?%r(QSy;7|X&bP#9QoNiB$!Ns*+a5;^tr
zRxujZ)G`ILYX;56`Rvq7<7eb3Y~ah#)oAXex^h~AWT4ah2w{*+q(7$di%TI|K_N2+
z at x}D&C|&!SZ0?`x?<B^y>zijEUsrv)Z$&%<KZfV$<kCGaOtvnMO?!N%J{0ejae|ww
z4L<JH!i%CL#fRdDiH+D?>BJ}kX7x;CF{U|FMJev{-Ll-I=;RR0VCecb!Z(JsOjhh?
z_^~m)OdMCdXJjsr*9L9(pZ#Dnb2@(iF=x!rSXf_pUw|o)4|9$)8yf!jU@$dI0;`~M
zhOW~r<bpI6SEJp9tC4t7Mf4VVBMsxC&=>E%8!>ALY*O%3BBrmA at JSv8gY=Q?ADH7m
zB?wy;!a^03M!c7uv;BQ%4arNgODpz51G)Ws*BY at p-Y&HHPyA?%H_`4g at rQq)-^H&}
z;4nFoLiIJOIEuC9wtM*<sn_@{#H%>F28PP*8J+FIE*{#r5MR5q2-1A05eWT8w89qR
zJKu-W2kNjk>HhbV8M}@^OX5zcez$n85Ov6$1R60~$w{7EBF&^Xt}-o)SoGBU^*Im6
z`ahE2g!FK;ar}?IOyu;i63;X4Cvb^Sick)jGUvaH2PtB)fIoWVzR(Ag&V2a#@sqX8
z(}XU<nR+;NWsf~l2pc&dQ%Z&uAhEwf0&gP&@#3b%4?+X?8{M)Nyscf)PKE3R`eP(r
zBcscH1&?-8&8ieCV<r?A1`eu7qKm5qNMOlh=&~p}*F{oOreskk4bOSbnv+{Xt`Id}
zM5V)Yn-Kub*#?651<{FZYEvEF%<<TA;UIZbw+#&?Etgjh6k7-^-{jrK%<Ebrq>tR&
z_I@&;W4dM)?O6EnlMNYd9rfO_eKDX{Ea-T8y&BHG2Ja<{*UU7t>nJUDaHNQwrmt;8
z<Bt^e_O|yrA#{`vBaS=i;I-hOt|LA-<!>^r+fBt10KjrSp^rGp at RIUI4g<iPD;qj4
zjG{19)9mvw&Zle`$xSiQ`x#V7QuMVrl=szEl`!%qoFZvbnky$Y{3z at ImS8VnZTU@v
zI`qo+Wdg*MKnX<QWRoG{t+VMw0mjD%uFx7<G>wh{(`KqoX4YG%gOuLbsL4=qCiHBc
zZKR0Nd}~YVh6-G7*%NU;olecurXv_q$0j|VEwqZoW<!VSl_Q0-##SnyM(6IJ;v24(
zwv4;RL@$%YE{BV-M9({&kl?J_>#FMv0Qx%C;_JmLeNTk!Mw;>(8l-gF_Ep$s>7Vfp
zEa?PBnot=nH76OB&4@?U%~+nzUEk#_CraWFf|a{X6Py}-kcvJhIUXUNNnK!Vv#<_}
z at Bt}|mZ>(uvy3(*gLI?OnwKj!tT$0><i7%N0Y6;g4B2Vc3mB at GEn!7Mj6w2esT6SB
zfPe6g@@_PQP_T0)ngbk at N$M&w{h48x%gR<6Fg~h|vYh&*pD(?3UXLdt98^3QCM+?l
z+7?-bMyJzvC~IJ*yt|53O3r4~qd16VLmabO+dN`X-DV0q``U|@U8F>5&T3_*IMgRO
z=!Q$<e%%p{*kvx0zH4~>zT(`Kd_m8FBlTqLmgFJ1sCdG8q#vfjJE*c20hKft(t<XW
zG~QfH at u-c@m^m!yBbze}@9Z at FXh+5_0U&5{i0uQ`6OOFyJtgl at O!bTKl~CETz#i03
zF0xfMv9%+?87RJ$@xQkPxZ-D!99DN6I?dTlQZ!SJX-plxQ+j6poN&>|=7sErMuGmE
zSLacZ!Q5!Y*FCD5{qRI?nx)G)l+Si3TEcBw^`wlVw0Au`O)@IV>=T7`|C}qG4H5MU
z at f>Vf7!J}r at GsNa+8~t0h{g!j4=*MvdzgAeLMydLc_EQor!(63C`A^?n~)qJm@!xo
zG%h%?ci-bz9NYzikk<i!6|W5xH>H$_28XK7KZSyi-9~-hSXXUt>f$J1`J<-PJ?<kY
zs^YeOH|GjywVEiw#JVc0LSeW|Ni-Ec=T^oVr)XwD+3RP1XF<h~B9ZG{kHj at Kxp&C>
ztxAU#QNX#h2+IsU`L-Qn#5UzlzDGOucvoz<uOeLH@~3OS1YpTuOnT_aVg;LEJjA9D
zSS6fF*-yi`ly1-312Tt|qsoF_pmQCs1A?Mku!SrPzQq^XS38HQqu%B4DFIHDxE*1&
zvSf_T65IYU_OX7qJz)y_D&usa5=ly5J<|F^sb+(4*yct*CjrcK8$`x$JWK+q5G))S
zvM1LS^rl`Zoz|Dh at P6*1uCTBb>VrS5+)BMI{y6>UUJE|oLTBE;gEPX~;rz&MLM+Sn
zaA#q+tS_nO`!T-H)fCq%bwu<0O~tqdv-R+X8l-~4*7M13YGH5*`y(ia0~)lU^(@$!
zQiDRUsKUVIDaTF3dWU)JIui|Qv&bpvaMn0TvfR++$@=r|1S()L3HWJ=&L!>Cs2gG_
zImUT{`n}<oX`I&^=fhy?`2;bSk5rH{tbmPqb*2X)YaC}n#rPC844MksFq9}X97;Bg
zXZ6icKV^`H{HE({)Moi(Tia-2U7yW!wJiJeD%#1C3S=O6c-^D#a;{8(yExoaiG%i#
zdZDLrTYv=7kMdxjWoJ>_-{!Nl7#H!wgwesx)I$)mmpX5AF%FU&?aOSEJojB6-8Hxy
zqcz>+D&|Wy6O+xxqpUf+H(z+*(96-4I^6Zmv1d>}wDWAa8RQjol+AmS+%rq4m*aig
zBa1tJF+-M)D+yIOl!}q|3BCZ4z%1=V1rnS$VpgbB%o21w$y3h?fWIh_kijn&k{JcV
zuu)JC*jXI~N##!*^z`~<_+*)?@ubx3L%giJMoWXl+ at QU*xH%0m_|nQjQRb482i5cc
zK?<0y;3`)7Jw5Q`kLH?Yd#KJ_GLK(8)Qi!S>I*AMxG3T7M{qII$Szbclg<4B7AhQF
zo}_P at dbC_Ts?X!d<_IimHk$KoRu`Jo0M>G+_eJk^+;{M$@extC-NWHeG+7*jtJmyD
z37GmyZ{2~cFL;}U?WPPZH~Q|j>ipwdg(_LQ<JcDgrV53wTQJ?E(=3JYs&@r`W?+(|
z`T-3a_rW``6kF}Mqk&#%Gmz+jb-$i at 2UWbT-e6<+h4TluR10uo^rtw)q9CY~mNgMa
zi|CLe+19d*T}jD!tocM``=e at 1v)e0oJUQ(nN0%}6LCgM+Da2YyOY$v-V-{FoE0hg!
zeO{_oMVNU^zrT9BxJZTmxLyBEwIA~hD3XB-KEySd)95c1U(E``N%}*!qg4CO^O at 8%
z*I<<qH8Gf?UuI at BA&R*5$5Gj6FY2w-<V6UCD3j9OL;iy3d)zcW#CK^u(5<Y1XzHt8
zr1#{`xdRhX*mU0g&#{iL%31BM?ajcWBL$Wb9OmO$)?^aq3vpfG9Fw at m!rnyDU&zR9
zZ9u=02wo_<uXvhM8UdmRAwTLrfA$qcPDawh5D__SCnCJ|M#{H_K;by6<J(E54cQJn
zbBA+}y|3!<9)XNKljV4ZRyh+l4;$SQ_~Z4j*lRN_o*H{qWDh=)K0tC8l(?VzY3Itu
zAiZIH5_2Ohsh-E2VJJs{Q->EbB?ccEl0WeBbd!Z<%RopI3)R<9XfmPKQnn?d at YQ(2
z-{K`hXX0Ks@;kP0jN-UY_NzK&gyX|5SzyNXLi^K^NI_<*=NeKh84H0CME0j1*$AY@
zX$+tZ6f#kTXbu?eBJB#fl2p?0Jq=Ut#G65furQuY+uUMqKB1OyE{vP5fK){=JUw(P
zu{Y!&HQK2#=PVS>9VGfpL%U<Z=_HcONOKmBFdg^7txl9LCu_OV)bH=k-sMS5>Tz*<
z7_U2jm~+KyYfy{W+}NI6Yz=yjpERR;KlZ(}*xHVdE*u9zMbeV};5e+5rdjvW4KX`5
zC0 at TDe-k}%!>iQv&3-nX%z0MFZQwH0r+Vo8(|@Nn!CKE!5!GsSf9%DgNyi$>3PF$6
z2rj-@=umj;5Ni!<pn#beP{@o9N8+F2e+|yA3m*d}%V$n98XVx7)-o;GN!Eez>h>M^
zouBh~+z2Yy9QEAtVuh-?BqH;i!+j01TK4^vw#`l_b75(7{T2b>oxwZuGUS){yRE_f
zA}<e$`&r)(=E=wM#`<bs;vv}|q)lVBVz3bMC{*!G(uvkJcns at N(M5kvK<l#ho}6-{
z)2DfcbB}xPaP3|<dmgZM+-Wrwu|<gw?pB0N{n#w<iOh8DnMhdK=#7B+$8Aw{M+AAe
zqzfIGb`?vtwQRw8qY5!|<?oKOV;!e?<f6cN*hY1AZ%rPA1$}{@IzXA8#S0S~^7+Ow
z0(c!77xCvPxx)HLHg{P9^C4T*x0~&sL#3_uLS)?pJSQQmU#^5c!k~Kj9+u6wlqD-$
zI(;hho!$0rxA-;>PEN0*;YK{%k|xh>>G3%|leJVN4K+SQZF|V0a4;FKNP`lr7zxL0
z9%)@$Tl%K#nrT&AOZtY;)GxlTGK{lnP|_39mQt0`v<E5omaZx#>ecE6r%SaQj}DKR
zPA%!McCNe;>?FO3^p7wT{5F~*XOI)dWiTpU;2FE)3hI at PNT$9aNdbfgZpr9VJdCsD
zHzIt^MrD=i>J*Gyqb9ZI8zvR&)+(p$AWY4zQ%B4gYy$()eo30=4Rix0`d%s>5Gn4p
ziwWlhF&^F*uT>%JSA7Js4I#C-AK4J++ypV8Lqyplc?zG5d{eG8?xXg9*x^>wEZQaq
zfHZL5>mXV at NVr@0Q7THPfcT*U8CFmAWv-M`>716|3KvGWuiaKu;7CN^ye9xdf}pY$
zq`UgLt=HOcJZG=r$BiLzz~YG(2fN&$6kH3A)Y_W)1>{iSXk1d%J0%AfNzC$nf>_dS
z(QYPO6d1lpKw5WpxQBrb!b)y5<f_^AHMzgf?)47()Q?~+BZiE3)F#)h-BHeMX7z|9
zh!GbN8VV%F$nevA7xdxOtYu40cMF|mFV--w`pt!|e^eF{#2r6V9d4iaRp~3EbY<(N
zOYr{UR8;>Ni<h0Yn<U9tAimA-;eqN!#l&c at L<Skoa;O_%ahNy6^YL|~y?rs{pm_(P
zwUV^}%X_C`>rjk?M*Q7-QCVi+^B|!j9Yy_GVANJsJWS6C;etDIt7=|ZCs51rM>r0_
z;0<sWCGS*{zLDGSRt}D$udISXZ;a_y5O?Sb0Kb6YfK at 9R#)9n(XLYPlR%y~$oHQJ~
z=i;}}kydNHr5Z3}QrV(VGq$X78h4*euPv9XG6c%5)oIkJFHen}Y+W_#kNtrOYr#@H
zaAb*C12y0I!&$Fb41F+1c%B6wSS(6(n|(6q1-dmPd?JvjIFu1aPD2ft0`5XKEaa9k
z^>$xzED!jDWV)}$HpA-!TCt&lbyst1 at Ho9Rs>h2tV~t}g^8 at odox5sqi)A#Vg^z1Y
zguqd1+PSq>#U~|Os)9}}i=_hL0A&Zn5O}z#lih5=L<q#sKq*q5UY814u$8)7O-dr-
zaBpd^ZVzcFY%k4#xiqb0wzRLlSQ#KcU{<eDZ{3UvL7`?lxdXsoSwr)$LZo at px>85B
zAehonD0k%`R-cqS439=MA)Znyiy1gIniXo1q_`_CXwC0F*pp5E<>Tb|Og0FscA?o!
ziYK<U8?_J~=i~-9yLaWsfN5OgN$35w1m42a(>nUXX?hs~Z+3f5^z3rTPJQ67^Xx at D
z{C4z}r48&&i<Onct9Tm9Ay&j~L7J6LFa-=NsEwuHm`)|_7wnD!k7!V(X4>T5*{0LE
z8lg at bSz|Hhk at 4*RY)rd;HUzIML4ZhC1rLL`CAsC2G(&&H4P1mlixo^a=PJxvLL at eF
z9x4-;(mfPs&Scw3QmJI7yoFB%y0j3d_&X_U5Y<RTR<E at 3WL1&^*LPvmrMgRWASBT)
z{MlA~tH+)vI$nBuZS at mgcnmPT7L%<NnwLTl{5Bidxn{I!Aa5(LzVl~ya}Q~KNc^^S
zbd-?9UyTB>pa3gF>Zx_s0u0Gv at RJ8G`gJPJ9<{7aL)w5UV9qa!$JISNIoyV+b at uk2
zw*>2iZpRgKw*1zU&JfigZCmJhYOz-MHljqP?wtj?|7gp3L>RjOnEG{bRhcMjakzXc
zx#Hgb@>W$HB_LsGf6NcUw1z?M1)n`?bR+3NLjkDW7I?Eq9kp|n-|;eZOxd>ythIM7
z)SnHZGu8c`=swmOEI at bx$RwN=CBY#4p`T`E^p&l at 2}AztEtbASS*FACk5Y0*_g$_j
z^|<)_2P8DN?dfUWh}4Iy*-7`+VN43$=|w%&-i^UwrZ1E~G8;6d*XjK4J_y;Va-8R8
zR2PVY*lCM8w7065J-pg$>SEvHkU!Tio}FSPuS2aO*E+Myqu5jOTT#Czy9R<<n`(19
z#BH{(`XQ`da=~rqcLFRtef!oiJY#pPL9tqlOx{|!Qtl0Yjgj+#xmE&&K-U5Q7SqWq
zAR<-^bv<|cId8X at -WxmH$E4n}Fb5i5>g>pQBSfbzx*vZ|$3_n=Aqu&*WNaX5G)-v!
z6k!QW<TJus>^o*LVvu~O-T7o)pL<|h;&Hx>@F=@DKc=w4@^aJ}46SV2Zr`hw)vBYc
zdAxTmQOoLl-mzD@<#+Wac|LXI-Hdnmyq=i)INR=r`?JQENa=_c at 7?p2w5jr!G|1t$
zOWSa!dZ^N1O!srEr%u(I#FYX@#UojAq8!!j3s6k?DY(xk>p8O2WjYqG&sZ?)xO<qs
z4R~$^B~pxq?R#=i_LzJc_<tN5%};l|F-T9*%zv_*v3`Fpq}f|=ew{)`5N_oUQhN=T
z7RzW$wjkv`JAQ_JEnM`~WD>SyejH{^G*q<I46R>DHvcZE(=bC<cX{?Ycd2=b9XFcw
zWKf;u-BjVm)!i4nyCP8tySCZv?q`2j%=1P|PXT^MAMFK7_EPCqJRAtoMmILJc4ieY
z5a=XB%t1%37)o^&JCKR64GTmoi;D>x5xUYwz!Jt=;2{+-q0&JJD>WK6pj?pU2TY5S
z_e-3k<=tkM^1vDa2m^ef5Btg&(>771xrhb|!!-?^N#+q5ixhPa9l5ivX{Md0#xtM~
zdr#7hz7$*u8*qLvbaq=`?og=S#kH7V@!6frc6&?yW_r6YO%pmFwYa`O>T^OG8%fAG
z0&8|Su4|5hlVO?RUfM9eYTdhEI~<qpXYspW+|&2(fMj_XY@?TR|Mi=IvVohxA={<^
zCuXgVTeHStkVzfpj8T3whc`3t*4mp_iu<9HeSM+Wts#fj|B%&cqle}h`)fBq^6B%&
zuY(r1%qJF`BWc;;W|)|DV`XqfOIo@*=4-|2Y`S at o)d!Hdn|OEF#JUNuVt}@24QhBS
zFZ5L2Vm4W1vdU$`qi-VK0&F at M8A(7=Q6i=#YAhXNdU7pu0y*_Z-&M`}PEf1K*H&6Q
zvGa|P#p`WiD{9kCHA9A5rhBaWxZRyfF$iZYi at eQ`MxOT$>IDJXH6Fap$OktYW(VX)
zH$B#MgW>g&lH5E>AaptO&o!&Yx5~lsA)yHR<RKjo`ff2HZnn>*4ysSoOvzV>C7WjT
zuy7QB!~IX0gU0O!!;#HPcJ at n`>lJ%h51G4-<c3uCS2~j8y<5Q8!2ld-!ggc=l1tC6
zp5=Lf?S|Ju(>^uzh%ToCYC=L)6=}j)gK2_l&+O6@>|~z`#NnjZs2g&IT>- at dpiS?+
z{&Qlqd9-^J2f at U{)hD$SB$|(|*DPYe3_xe5Q;#vbeVfW?hTJM_8ERrACNf4ERP;DU
za9Zl9p`a>BZ?4o%ScjZLfgRsX*hSVwJSE;fj!a$TDbr_W7KexfHW)D at lVBmbKI7gb
z60f;lU;$`p35}^({G}Ti at s1%ni8WCS?aqD)C at +2Fqbb7v8C}w{P5zxQU4^P1YpjmT
z_vBdEx6DaMo4|7lpN23}&vH8YNy(b10dD*Kfm9^y*YtEYeODQ?#Cr?Me%FSF8;M+l
zQ+mR?rr3CPBbmc_GYxbfQr--uTF+MEet!|svd!TUrssdZd?EH_DB%L7IgF`#y(VWe
zlhhJZ-M!l|5Fh?lywMiZ>Ma~{KZEMFxJ%{P8+Km>QF)LHww)bjYhcF{VEcQedo|=n
z^Fb*^^amCGxT;IQJ_5k7+!dE-7{>m)Q_jv+Yn7Dp+6nc;MgqJn!L>8-aqm^}Sxy3~
zQV^4uy?z)2CYTGv#R at rL9?tN}^Ls6%CcC=*wRd`_Mkb3;_iIkpwxa#*IgqZ^<PC*H
z;d^M+6jz*Q6;@GN^Jmip{>mYFY64i)L`6%+Z7x^^^)Jbp{tbS(=321kCd?+`s#6xt
zN|T7;$|HC9`ldCzHjIoW?lf$MVWz=JGe$$yCO?r>u{SXW6rIvnt>~M-JD_0K$_-kw
zYugj7%mw}$ajgRi`u8-z%ao!A at 7q_~??U;PkprG5<}=Caqq;-9q)CsVnC at Tabx9vs
zZgK0SD=uA`1<a;t(36qldaMT+=rV@$piGg;MsYv-LrWahOA?XnyRu^luM<Sh6R?|Z
zSx?f|4pZj)TRcCU*7EV%<r20v*1AhXaBX$#3%#_eSLb!YC+ at Haab*h$dgvaFHX|zh
zuq{0grStsF+VB%ap#`K5d4#X*(!AfVH=R at shf#b4x);6)K7K#DWZm~9m8j>Q(LL8X
zZ1K;DnUy?|p4WWl^L*+OFZ1x<{VF%)D$UN~Lpi|uyAxRG-w2>k+U7$6TK+LDTP{aG
zQ~4u(Q*OC;PWNIUVLcG^4K)4Tmjv%j+fI1JN0 at NNtQ8NRGI9OHZs!!lJ<ikc3Tg*p
z2az0yiwL=<{Kp1KBFLdutG^WJY>R=g8J2qvz5}CMj#pGinumIm#G~co=2_uUL^`h-
zR%6$iW)tti<Js0c9_w$$tI>nqYhWVF&M483Dv~WG0}gYRR9cN>P29%Lnn|8e72mL+
zT|zw at eNeX_j3eCzi3mo&GEj{cI`C;%$OXy4kOuSPm?nMOqD%BqS7%J;=^(nF&&}1q
zJRVEtYB4uMy<>x!N5d`WYEg~%qM0f~=pSf5o at F6<5`!6M2tI@`r-cX<K)Vc8po at Hd
zvli;Zoa>7ZfSU6Klc(}C5Ebd8qA;))>HlI+t0~e)88`jX#8fGGPW6!-z*JjSo&S4N
z02}PNJn^yk0C=PDD-J~vqg*^^LNMbj$>Ql^fg!|5NDG`aR1Bn~q$FivQ~-!TqiwyI
z8RjW1f`#)XV&WO3zNejmo#*xrUs!E(S+lpHw8#7#s=lkh2@=W3J2<$@bJR7mNQ?Hi
z_vOt}-);BU?kqx{wVkJ{=H*GXUwYVAUz}f`eV*EjYZKo&FG8ESou|J+a$=&27LnXp
z1n<%bFFN9+;rq?t!44aKh-hGRd^2KRldXfDk-`ZU2K*WtX7zTnb*qmY{}Wua>=W?q
z$pL(%$H><0ZkXS$_u9J9Sihr6Oms|C at dz_}tF4^cGAlbf8$AaD6FYk|7xq?<kB_)+
zdMlop<eR8V$hXSoL0?^;UtienB at x|geBRh*2L}oGsV7N at UUY;>r!_J-FMYeUgU|L0
ze%ANkRuw1sJ896Ed at c^Mb03#TuKD)UZC~G}W3fjP!ZjY|6&~WR=qr at Bw|9sU5`MzO
zj~aWLSIvOUrWr8|a*ZgFS#*w{;B1l21q4ix!!PJslJevq%0P_>u=&8QBJy|(sK5)L
z#p^K=K;`@$JF;pE?gHen{Q&sv_r&Hz2kORh;m6)8 at FtK>+$JDrwY=*9OT^N5UuXEs
z;A6Hm$X0nfO`nSIrWx;wIk+ke at Hd1~Yel+&nPybFj$CWlhdH<vgrIM>8DvVLxAm%^
zpr`NS#0=z(!5>qI=)_5Tr1q^#-7mZ+r{6LXWsfV>c4<nkC1fEeTR42P#d1v))Mbez
zNn0Yw<xjFF_S_GxuxpBGIt3T1uCfB`LvF}Bd5xVexn1L0q`vXZ89D2q4<9KNf=&+D
zjSdfnclibDB at b;feX<npBIm)0bLbks^2j2eD1C_e0Nlr4OxuWHYp{vmi_Qsp^oHTs
z5J`($zZ%PuXysk6f)_93tn|FSN~sjiU&bsurQH<9WXY&W^nZJeYfROAgO1u!iaE%|
z;T^K2A4!@!7cCq9-n7Jv3~MevXXz>SKpS)IVaWDwg{Di9FD<ZsL%}r+H-bR5|Nax*
zcF;q$s+}`4&zv^bs53VIapG};#B+yuNlTmbx)t8JdV4>Lg;QkP+|B-IvM2o{J?Yrl
zx8hYmySpN(szZ3L+rPLy)P3Fks4Xx*-;*<I%+$z(=3{fgezZC)fX5LtAUl%H^Y(CB
zvhALZ)fMiAr}G*c>Fs(VNazzP+7lLa?0GzT!hYdl at u>)qrI*bvf5ec*<q((288jrd
ze-xkOCF4?i!)JWL|M~z~?Y=oK=M}x`@alDW)A4+E&w<;-?a9LKz`=Wm=|&0v(9x$&
zi~RFSVgTr-Kk-4XjvHpzRT*5(i>AY&Fqsw|apO=&G*4X(r+wUYwMwG}xAwvd;(Z$z
zoji at 9I~#JSVJX<1NiNXrt`Az>z_|<Rpg)UtNif{Jc1F@=Z5Eou!4CBY%N7|PQDQt#
zlRqLWm}{)Meb?~YG at HmvE}))l7nyA-mcPL$P>Vi`f`z5SH!P@$GZNjzc?zu>2#mt<
z99-e2JL^SQKwz212%AM`#ARR*QHmN(!~wi;@i-TEQ6pRM)MT%(WXiSJ$n0<;`LVdC
zusV_|xsb?-J|9gpqHnJ|y>mb3YRCc%%r#93uTCvwV1V!y^`L;Z0K?H19V8?qg5waf
zfdUBxpsJ-V0_3t%S3z?JgTJAINJx+|TXX5c@?ciNW<dGi^T`q*x#-3HAen$4&HQx|
zeAgv4=Zj_1Tfc0HdVs|K4<y=u^w at tST6#KmR)+scqot?&Zyv3Zo1HPOh^>vIkTJl}
z!Q9T#_Ahb&uPUQ&ZA>f3|L>rbGB+ at G(04SqwNW&7FgKwVu(dLR`bY0K1>iIN75+{a
z5U_RCq^4(Mz^7)UW5lPYWBYfZW7Vb=cht8sH{`c5wKB%1gQDdJ7#iC+;<K^SL(%?w
z<UfU)fu045R#4wg%-G!2%<(@0p=cEyjjdJi+5X1-d%)kG0%HdJe*|C!sK0dH|6)<o
z)BpFY{8tYG8|(k213^1}$|isg#`l^_IC?YBzYtgjlAx(k4Ew2|jvEMUo*)Xo=%II=
zwt1E0a^@_;FhjO(AfH3oBy~WQwTXE$A5ZFdhh<Y6dhf?_AE-i at joI;|(D&ua3jRaW
zqeF&%r4+BRI(+wQ$NB|o9lPT^7_R@#kkbx003{<P|LOS6<`OMZ&jbO?jfUgIE2m_b
zhm|N$si}&?hkJ5jDdmH>lNL2FzriTU`E17|169kg8s11gF`|;{9!To>+9t(etjLxZ
z>sYZ!Hj1$84>#rBL1d?)Oe`}X3>&EgihcJ5lHE9YG$ykk?ist}3nKbDHfE6CzK@;$
zE(~zeVH&L{GxoZoC^BezLB7gM9=pmL6|4F!YV@?cqFDWfZ0Zv=?eJLgbx~6a_g->B
zvZ{;J;N!q&;uDn}|7qxnH}*yUsQy`}Qr9D5+SJY4U1i`C)fE28{8qY%cbvcSjXrC)
zOum<D59hNa+URopaW+#wH@(vg1MdC2DuY^a@(gQ6&^PgaKq~$J(oFI{F-fcFWZ?J@
zph^x-#{Xdz&<7a*gTwy?n&u7wM?o`vhkuBZ(*IAHkrj$o)!fL at 44}!#!i>+z#*WX-
z%!1Fz$cWEOM~BbE#E8%KpYlH&11szQob%83UvpSkSfKvt|NQ^r|D7y<OX{DWm4V?u
zbOz?X`ae6%|G57@`@i$wyuTyVKRfH+`2QIH)5plpj<5Yc!2aL0__r4R1M;*=w#qi<
z|5|DA{{!;>?;`lG{(}E*#Gz;U7xsUsga0PR|9wY>|CJbj=<cDFF_LsL>6x=7_V#c<
zz?btuz$b>!r`J1-mqQP?`a)n;+xH6}Be0KFr#|aAm}R<vZEJ?bDT^b6t*v|0X5Z#O
zRIy~NYV7*>qPd49$|b`jgT(x_x}(Dd3DI_G>@v!*)l{UvrufqKdF%TM;_YZMjnQ;E
z6YzJ8L)?GgBLk5p{6+rhVNg(@Nm%h8)OgMJXVSqS5n)hQRDwNh?9I9owudK(pY}b1
zVg+k;@6~<P7rHw9qd?ks;URl<es{^UP=VnQz;%v4;p<*InB-yvy7bIs_of}DDl~Jw
z;m<l;Vjf0<oxdEh7H9>#{(hgHp4BbS*+ICQ{o31F$!@)ID26`M4{T&EAVLZQR;u-t
z8~SaHhZ7Uy-T8Q~QHlrgis(CVBboyPwAd)arc<<J=HxCIJZpqXrIIm_mX?$i at Wtz<
z6cPs#q)Zu$5mo<84d;SrJnyjkskwb`iN^EkLmtGUj4iw^WIC(=fO;m*+L-$jQ{){8
zaDNZ=#@RbZ>ffAiTTsT^`}CUw;*z|b%pHdN7UG2P<opEYZCz6&ESLKPH}<gOgj&nb
z8?>6ipQm5r0qlXo?(?VJIZq4<eV=8lUjVEAw#djRL1VC%|2R@(5NMb$O)jZDt({CS
z7o2X6{pU5k7y2f|wY1sKONdnNa+I7;#8cES5ECanjezb at mHbWCM^_Bqsnb4hoD=hz
zQ%V>#EvtpVwyXm%fod-l3SAM-9i#y|7l%~MuyiF<PgH`UwvLJh!};N-(cs7PrRFMi
z92;wM8;!+Q1 at l<d1zKGdRn3OR_Ixfi6-+W3iU(9NNv<oZ4q>{CNboM13i%4xXgy at J
zWQ}}-db;!j=pwt;#HAv1d;?a3d~pOh>Xy0RLu5oqwna+54mT_k#KL7-C4>HIF=vt>
z1`WSSbS>it0j`!FXuTmBg*No;BRftoN6_j+KT%>J+(W0-1*HuTMTd at zCcg5@j?9p5
zIE`m&;#Gzoi+~*^Y=LHg<m%Nhxq~8%CxH|;Ixmp<HHdIn#@sRtLB_;9Q~?PS`=>Op
zl``ptBujxR^vU9n<%Pj@$RTAXC$X*+bc~ND?7-GBZ;arDek(ZI;xyo1C9OwgWg!Wu
zK69kZ#9l7C<Nj$Q3BYA#?58DK>nu8WC6~joY-NAhLTr!p{-<Jq>+SHcB6^FO8~S`b
z=u#Jpa$!Wx;(WzA0Cd7Sv3zW?jIoha6iYy`d?B=ZmgdVBfolEX>{TH=PXEMQg7xZ3
za$}S2xdftZ1RF94%m=GjwnoaxT$dQqtKig6WZ*NPEO#!)y^v{gGft)WgiGzR_R!`I
z86x7pAD-gLtkcx3>>cNl$A*&6HwzHe8mtwUmExbPabwf at M?wt7#x8ecIm^g at 6PUjZ
z9>x_{qSn!@OqmJCT0HjFrYfQMYve9Z;q)q+rI7n6OXU=Xv!lVtnbn0mA=c)3rWYNV
zz4?60q0+%if{fMj8oxzX7tVqDB1*28zACxFyAS5;<?oW1bQ{TGO0N|SpFb5EFvHoN
z8EDUK#y=^GBVWosOMqu&oQxXWD>af6|2QOWa_I^cfNm%$7g|n(FBjO9PF!h&`Y5k;
zE4S36JB at A!*DHbz*QSwGI0XlBk<`AmIWx;8*rtLx)+ZtvE03;jmR8VwU#ebf#4iIM
zkA7y^9u_%sC|dEIAa2sBS`pULVugqDh1Ud%#XR55T5xT;LEzhkk<@Og)4AxUX%vGs
z`0Zr?=p>gGJ#V2?mUq!W(K#qCR^Dl#xVUrlP>?nE<!eaAMRzwVQy7Sl&O{>w-uYRp
zPgXubb#`x%f}GM`L_l9A)PAy2>YkcBKd#3iyI#JZye2*VgP8!1iB_eQA%WU^d1_p`
zx&H0Z;-&d$F=A>jQN?1NNjOc?Jox8t-7KMnpd^imh$`>)?4o3JDg(7yD{k2=1?2YR
zkdykXcojG)@r?E}3}&I&cP*Fsy2?`67AK};aQsx}?D!j^%M#>|(c&s?TBukB?zvf~
zbiI0twH2>&ptW`#Wc?aFHGw*0aZ17}IT at _HzdYw^G?YLRb;>{Rm0Lc)h=S*7_UO)d
zMHSfe5k!GTO6;HpW+5sQnL#;%UpA?J$-Qr^b2Fh_7V|`B<|4d|h*OQ_;)wGEg>ev-
zrR+tC2P}x)!Xj_S_E(VWfMok+wKCZ~C(clLWh#$1+bn?A04tLk^<pYHLlx+Kn#0y)
zRd5xlbSe6z69MHbVhdN0y)}wdy;puQ6~Dv|8Q!{6Ws?w2qwN&j3zkpI=2-6O3Nj&G
zs=4NTS6NWs6%Y&|{27Yoven^=0T{V8?5St6BB5n!zAQ6x7_LASDS-OoBPUZ7v6*VN
zNysB4<ueB=NAqyk>qQ9vK|^hSkA-EP4DyG~(~F at C3HZux!`&@O>I--1>4CsqjQ3~I
z(l*xCfG?jUO=Br5g^`q$8r1(onkSLQv;%Lt$MzWZ8l>p*;A_#n>iIm%C%2ipeP`gf
z{rqL6yx(Oyd|0>Aj(siRG<Ma2SHFF`teV3S(X at R!lUDim+VZ`Ir_{~$oK?{Cx`s)x
zZ27(WQGt=B;w2Gtj<$6y1E}fO?~TG$K7%{MTSiL4#hb&ON9;ny+l#ps8rcsxuoqYW
zwPfrc4dBWT`I+q?JIHvxYc73jH^F_3YJz+`&b(W~?Ya<vBD=tN%6_$5fIFEkwN+os
zSlKM(=ug?t&QA=R8_DkTXXT}}2W_jr=7?h4!($Gv8OdB+-)V79u1HZ)S;S`Pr_0-v
zkLNyGkL&T2ZuXQqeXYB6<I-tmRJA&HEg?kD=kAa6?`JrkcinFU4};cXlb5iSC)<ni
ziuFg>!HaWIu`Jm8s$(4m+=GhSqBF`xA?3@`Cl!DvO1F|zQFv)Nw(=Imv|QjeWxIyZ
zG+LLAP`FSPy%pK;HHt1Z$#H}(Ey)n_0NS2pkSbJI`HcJt^?@sG_d(YlF-6V5`J+Ry
z)Q8T|qLc&A{i9U;7#rKI$8?2^!`5qi0vovqz-BijoIeL|*dk)B;3yCP-6Kb15%iZ(
zt|6m2b9TRI(o}9OY9(Zwpn34ga67g_W7rhw<03xnL%ZK_2bRV~xj$n3 at wX$^s8f3w
zC$X0tO#tqT2tzk^JC=5A!yF?g_Ey2If$L{v^l14H3{K<8iI?!m?Zj_&5;P-EA#Z*X
z2;)xO;Z26>_zWWjGDAwD_g&Jm-L2R*+j?NU_}kV<2qWw``+`X51B$dlF~2)J<B#CT
zZ;@dJAr9jE*ZJM3JLfbec?91?aWS>^{;(bxUdo*0u_-FnlGmc&ToQ-xLPs*AN<dek
zk#Gv}pOLzGok}D^&EudXcYn%W<I%{*_8Ic-H)#P8Al?E+?Y|Rx^vBuy7lel(SPmV3
zcWB`Q1XJdfAkm}AkY$Z`eLvS at wZ<74Fk<1xNsVaY<Lkwb0)?e at 3V-Yz8*xnqYSCQB
zhou at wTVO1gdTNpA5e20q7MEIiV3RnBcN5+xEVx3lm?TANN0P3%i3|(H65W+ at k&_xH
zsRtX%mO3?}7HDW`qLs0(*F$*{C|ehfwk_m6x;n68f+?x1x62dvDpVkQC%Oj-0Me2i
zcON6Cl=}_N&rdNVx%VI1x<63sSo7X_N_LZJyn~;&H(V+Eu3cnWpllzWCe_dU0ZAx_
zUR~VY3;QGRSR*H-k3N>L6WD=4Qg73wza)zX6txY at C<^HX_B*Sxt5K9a>?E(+qj12c
z-tPvh>bm=jv|;D8 at 3Uf>osO7TS=p#Uj<MjJoR6y2bga3#dR}{ht at iT;_`9phr!{`B
z-D9~lYjehHYotrJvp88kig=%nV>vY~_3BO(Gs{fU1hrxYw{i at 3`Af_wJU9(CRKRyI
ze5MT^BxVg#U{3CGS(YUksnyN;)5o*{pc^EzrxAy-myXU-n#(OoE$wxwRV?U%P^z8?
zF$Fi>6<bTq0&v!$p;KOn+S<&_OSNsC%ZWHf;(sEl$yxuLQdZE`IQQ2(lAEEOoJFVX
zWK>lb2ccSbJb|XAs2Lp;mmC*!N}6Qtl at SW4T8k{Qz*uJ at nbwC>rm5=lDY=MByvoRF
zNfX at dHkRgYQh$|Hb$Lp{V{x;P9B=VRS*YfEI0BhqT|VMjTF at Qqif^jyxm*iaE$TWl
zAg?I27VYYkrg5;K|6Ytg8sESk>0XwKe)Y^=87Fj@%L1$W`!96E7N14(BnT}I6<Hx4
zslOA|a>}2E$O=^hHuxE4(EKL*#$e0xS?5OQ?#_wStoKpj(&%+!z?-(&<2Dj4Arvjf
zowRFSCz>VOo)(fZUm=4r(m{iClhMY1!(S70C*NbKYN>rF)My$3<|>r at Ph3<icax()
zGW?<$u_kku<7#g+_mZd!wcQr|E{@%%1g|31msUvU7;uKevXdh+)n at w~Cr{6L_tUgi
zTlbp#_s4V{eP*0Pv*t!+Ok2`ryQZIR6>!fR+M<49fai%$k$bJH4?TPN5XWUo<AFFX
z-jO|cOq0s*CX=@~yq12^TiG|$kIa)82H$5z=7YD1{^}cW6cu9;2khohBoyHXf6!GU
z&h-pICcVPu6WnIe=O--}{3lmwHAHIo_7efBeHFb_yex7PkB2!-Xla9m15-bU_Ty`~
zOHb$DO!Cq{hh=w*2S2WlHn)mT?%uMt;=A%7u5IHiZfu{r9{2#keL(3<x?>cd4?`CU
zA8R*`F7m~EU&0k0NJqGSZ7se&t at _HuiF358xAIslE5BAl=ao+g+bb`qbeE9SJDce)
zSkO0sk$dlqc3gKHe4*vg)S5`7B#9desV;_gMKf2z2z6>SB8{NWoFyrU{geleU{r9=
zjos4ixT*UhAjP5#?T4s}!2b-SnvmkEv8TE)MLr*}vW&B*Q7*guKfRoFSX5oNz!5}3
zS_SD5BqfF!U<jo{q at -KAYZyWr>68YQM!KZCr9}w=0YOr_yWyVk{rq0_d+)u^bN{&W
zJZI*dwb$Nj at 4ePKGtbO#R@|nW321w0&l=yVIPuEW+Rc&sGNgmL(^f-Gu)@&)NrBpE
zf{t9quIY61T1-TUTk6+lLP63=_x`VyM^<>*yKxJcdExo0Lf9_aSSIFmoS727Ma~%#
z1>+XwU#(SNZs27S58oHv5W<^G<0)Bg>7p#hGst=)PH9A>TC^D+gq5hQ85j?LoCW++
zscJCmklmCzv5m$p^R`NX+`M{Lg?qhHWg<v6Mqj){Ewk-X+t^}yc}+hdPv)$x*wyWw
ziom+pnAf$VedSmse7G445%7b-2}a)>b#j=;;p+HFLJY$WAtK=llvBsIlpp6cy9(1D
z8DYE3OIq!pWFh$`=PCV6&DyV)I9;s?NB|i=Uz3Ta7Uor~*Mu0kuO^O`ONApUU8%R)
z)ZCrF1SYy47vi6(6V+ugxK9RR?dpr~=zo_!HE~ahsBKvVKkywXRA$yrDY=-4F(acJ
z#7Pj(M`Wg9CNY;a at 4Y@T-*eepGr9EKGc at t}NDz>@mFo;AQr{uCF-E+K!G29;U-)5G
zJ()_+7=`Tmg(tZdIRWlEy@*E^{RaQYijk9>OV`*F<A#j4Zw<9Ic)utJFn*~-M_scJ
zFLlxZ4X85gzDrDGa?!I+?oz5I&NZvWJ8wg`oYUF7|3OqTZc_%mFgd+oGz!PMG2ZOc
zs%rVHC|W7`WY at RX67{4(4(^mbxoVrLD5^}Gxo*SB4tq3c^xohV)r>Dj+ at 36FD^`#g
z4~|45C6#gEo$-XEAh!O(Mec+RInnm-LU|hjp3AK!R#xG)5`4^Mj`Lkk3^y at XP)cjY
z!B at GKYlV&Fhy8ZTE$0|t8 at l7)q1HW^4&Jlt%(j6Rp09uIZ;H~XQ&o?){A5dEL+i_l
z<5TRsIEs)8LZ?y=&yG8WZ@&X6EY14Hcd?3Dw_ at N%kYk#*XmWMd(djE?DF!Pn7}4dS
zffRW)d39V$cM)04=x}o8(&?V1Dw+tCoHwCVDfCaH+|@MN7g?ArmK;$-;ENqSBC)xd
zTGzhab{%sk>1SIRGxN=3rDynf>MwqxO=Z%Hnp36rl8)L}HGK2E=3K6&w$j+a^5N5w
z0bQKHPLW8onOl1wu0cwSjJI}oANkYyru#lefDgzlQ)oq-mg>(Kp1G%W=yk*05RQ8q
zt$M`Oo^V&KVDTE0!PTj3yEcp`eAuTwBK3XSt}@GcG`Y|~Ynz8YTRF7Lno&~V;B3+%
z at u5PgBCcBdQ$$d-FKpt*Jyf`cpJwuAgP#%BV$et-R2-7qk$1yPb0^~|J{7rX2<G97
z(hCAm)?2OWhxs=U!_6#e3i14 at Z*2W4KIHd??eE`)7x!(AkQJR;z6?E^5YQ3_39{Cs
zxFz8|D!g5wd4Wkz at T>}VL*yvUFz9)@^)lVQVf)Zm`w~@L5}Yw1HAhkDu@>&?uM4y0
zXxCAE^@8q(lSc=T`nr<6=)Dn67$2X52 at Mmui(m*UC1iU9{pfUL*Gx^69n0=(+z6xj
z+6~<s?~0g at CuXh;VVRNyxrX0(gFco>rF7lbuTs-K{>^Kiu^}k|l`Dw45Mv=BRGcR0
z8r=&8J&4e%UyH*FMsG&tY_y&h89nYaLJddymZiIzUOGO~xrN+3Zm(X`JTnb{R&3FK
zi-nNifS<T`W4uyi;VslhiunWKSVlF*!QqTUyVM!QL|!W^7i2gobT%*Oqg$e3Z at ERh
zs;0D4VD at IC)3P*AP^;3D<`U1v%KUFv9)%5pb(I9VR1Yi0d)FWpqmat4y4%JYS$k4i
z;*O5-->*`)sCllQj_G~kh9<XYB&w at e-b-0ZXNZ$EdnxQCbCs0hChw&pkGEPXP(Pw~
zG$EDfk$Ca?B0o8&a^Y}koqc?|ya2skv6{x}`JPRE;;@e0ygBT?Ba6VNniF%BAbx9U
zRg+rvJWM^M5qfCqtsdw^IV}*&(yYBQy^5qx^YD$AR3^`oz6d+=8QH@=dPLAQkFBtL
zs8-(%P3oI-4^8=cCA_}m<pCwmeOEQzJp?XeZ;*d-!k%VTA)ZHDsVV(hZGK6|xznFq
zn_OGW)?$I?FgJN at gRC7ZsoPF7ygz99b~01p(A|%C()<R&>Y~dzm&y%Tr8n<m^3LB`
zc;q<}{oW!}`P&Q8 at JP|JOdpo-bj}_XTPbIAxL4cwy}gYE-xfm_ULNjHelN%p7rb)m
zsytKUULARG;8ZRUr~3lmt{J_VRicL^ig0)-khR^kxIBi1|I474WPwJDT>5usED1W1
z9+ at 61EZye~-w{~)Hs*nu{OUgbL=;S|8FVppLv-3we6uFkJrm&dS`0VA%mmo&K5u+N
z(aX^-ti551VUu|2AOo$rZneBJ*y<I$&O^FPHiJcs{G<D^ywN1<OzVAEnQ`wYjpx1%
zx63xY(IV!aY~E5TZ60&hTK$$NFgR|*vg_}!e3_R}Mf|x~0{Ay;^UZrhp+PL}4%`F|
zi*BXO2`l?3(-=FJWO)Om;+`>W%- at B?+_YncKbrAm5^^pi<eDf$ixftg6M_P`w`o8O
z*SHF53l)aGkbV-!Elv+<pd~X|SS-qelrgEi)98BA at nx6{&jM_W!&}CjPs1GENgg;z
zq-uxS>gR6!8ArpOzz)R2$Q4M>9@*KtLU3p*s71mFFS*bRED+_!@U*<lOVyn at g9kjn
zEMvGc|D`46jQfcA*a6E`Xxsu!4WWkG+f55l_so{GhT~ckvUW?5tq)d2lM}KLwd5T;
zJ#3i{vYO>*jZp8takJ{SWJ at y+I{KzlOpF-~vzkRm*%~&pdH>{rY*qErDdF{lnSr<C
zufDXH`%MvNhtoQ9$jVcS)O?OlKPhG3Uj2+w-E at i=*@o7OV&pGfC>qN2<rjIwt6>iC
zXt%YYt)b-G1=!WGj~CRYQ=NBi!l~XI;d$0}$+uCy$;ctFnC40g+lY)IAHa_#s~CC5
z{PfW~zVtbl5n&Xb42xkN^CWJBY$x9Qi>O;+Z=<#)9$Ge7-8X$n5 at vgsmzHa$?(ysR
z5AoR}v$;`D20D*x3HK!GOIx~GmtLxL((6Tosf;MuNgYXEmP?2*4j~NN?{ZPW=wCu5
zHts)QBXjYslfNnDNo^`yKv+J+JVa_#u)a#?d{(tMFhe5u>})iKLF!9Sw}Ixf<d_gb
zT=2AQL5euld4s`lUipXsSB^jBW`bDO*2TAx?R!{iQnH_4v{S}TMY2h$-S<>}?<C}i
z5}i}*=Mc}8iyJLXBUsBadowK7(8HYnxk0IINQw_Lx1WFu{l~gTJ^7 at P5&jWUJohML
zF-4W#SK!CISVJ}#bbWOC&)%!uKacifq7K-Vz8+c6*g8+t<tp11_})6SqF;(#>bo7*
zS(bI|XEwr+lhSsD*K)M?^5S*kwlyN7C|<$6#Tb(G)`xwr*9Q0jU*3j1j`>^>8*7r)
z8?72CmfQE(J$~@@#D}c1Ua16~MOPXdj1R%^aT80iQH(%n4BqWesP4>NMug2okOy^n
zN374{ve^62SERX|raRyDYlLav*S}jQW2NZ$Y3?nY#j`jvaK*D#<|@%N^`Lr7OXq8}
zmICwb#V6hr7dfey&MAWJjw-jgHr-9+i-ga<K63SSTM+7vp-lCdV`4qXbVuE#Ot~cL
z at Y8v6sd^!I5t}j*;zaW~@1>;_1IZF*&SLVzLE*53M`*R7d^!d^@hRSgiju_**eC<@
zFYnHBCr`Z_TEUvi9WmG9HCW;iDUl1 at BTc{K^G2>~1-BdB1-<$@7V6lx+pO7LteUv@
zAz3wa4<F2wzek_N_2y^O3n=Q-A|k%7z(~ULtc4*hN(LJ~cSi#Fyd_q!RP#9CL*a7C
z6Oz%W2uJn6;228Ju1>P$JQ825F)pUY at yvW;Pwe>8;Udh_m6UUMyii2T3TiYKnY^1)
zbrv5>mRtv)DttQ0%lXr}hr;>$(HWfLOR^^4iIZ`X+Isz0b~^k*c*1Wk at j}jV5JwjK
zVTvW$i2UfuHRoaBc-~Q-Ehjl%mpkjnQv_<M<=jhCNs{)?@sp;jVYBBfPjl1=DfEj+
zzxY_RlWB`OK26!evdvv7aA~?BqW`Wn((-{yoY+GZe_8*`k^x#wLY27m9{Br~;7BQQ
zWx2)Rk9YD!HP=?*;M=zsUC#{(eD58Y>guEqk8-Z;m-5B-lu7eU<=fixR<@-S(+fUW
zbuNL`SYJR4&Hdfn4CNa#&3mg at W$BC)=@Sy0)Tvo|#>p(USj;!;G74(1TapJ%xZfyG
zJAH+L2%X at 6pmt+-_vTvlJH;Cb_q94L-5}*Ovc|n0CvW9zeK%$M+0JiWG9O{r^E)59
zsWj2+O0ISn-&L#hi;~}tI)y17p|KAP37_VJsLQ%ET<zhlM*$HJOkdsbk>9uL@{pp|
zzpvWOu(AC3GS^d4uxKedvikGP1{2QO_~x2}f9e-QF<aWQ2q~YF*B|09Z9=I$FCNX8
zB#ryu)5&+3J=HgNwe96$tsdD?vo-+nGl0IPee98os~+C!#&fpfmIv|I$I?jm^xIUF
z1?=;QkL^zBo*OSHc`TkrMDZUazDvFBKHxZSDz#@hGEVSq1;6Pr8Ttih%85zE0v}=1
z#;82ou7Jhc at A;o{eI?Br>+nu$+Zb`+1Ok>Q;klQ at tV<$h{KGoiJCU}u)On%;DcQG#
z at TvJ*oSxjY#xN6PT*>kN40p*zGt0HQcFgZ>UyFHUd)|1Slkc}WJ&eJH3CYH<(BGI|
zqp7=fYJ7Tdx<zi(c9Rs^*+^fsVn<(jv*?A3N(*mP%L>b5FSi?RMwA7#v7s>CRIRN8
z7lX8QSpWwcnBx3+t=hx<HAcb;XQ2q`vNM?~EtKy~0N1h&Pky!@YuWrNXQ6LREgvqq
zPyp+w*ENj*hR-F0-y%|_+UN)3Ff$CP`tp~JKgS1f5b?^A(Ra7s0jM(8h5R8fK4<;s
z5^Q6;Kmb=;u)ku(wH&yk&d;PC8gjCgtxx%3VOqBBhH~%K7H5+8=2MkSecFV;JyC4#
z^iQjz1riclWYkj}u>@C73R&2T31OWW?Qj-C0=2CT_FHP3Q><l+SauHu2&t#3sTpsL
zzO%8Kswp!(2soJA_PcxQ)_ke=amv^+o1M}2mrKjQ>aH%s;Mu6gx$NWP?U~NwaF2S!
z`3DTA^KKY(^9Fg&{2dzypLTYzH1ilA6xR+q at vo#3pczebJd6s8Ktnhek7-op$%M5N
z?KEO>R6Q43ubHxIo0)-oCEYulpAWuE5OF_1XdwBlGmzm%z}bq~E#uJzT`q_KUo<fj
z;WRbLXa`a7aeMbvx|o532H1I~#k))$iI(-AN*-RnQrDV$H+U at MZs6SY?Dg~Urw09-
zeZf4*@&=fT&O>1sl0wJ9QLXLXW6nu^UIx>L$vc;RukT*_T2n*5SV~gY=@iyA at 3t&+
z#1V{-gL{M@{QTwmEyIh8ox$s7e$iL=`i#9~#=ed6b4U#`bNWaO>X=dBW>A`8(nSVc
zVhhCOQe0Y~d<~j2L-_y>5w=808!6E~Qy>-EUwT!a-Z1FqGcxzIGkvoERPjUQKmj2a
zT6J75+6=DQBfUUU4;%rkwD4=z6dT?MiVf6BOtSNg`C|XeiE*9^<Gag8B5U*kqybG8
zOL&+J^`u>KU{yiA!!m_V at 3PpQgD#izyu(j82{luS*ANPg9?zNuI}Wbo$e9|q^t6e>
zo`)b_?`&QVkqu*h at 2dFd{+O8?sY=&USj{yF3cpKbOBmxB>DKjOr6frdswb8X3}$Xg
zQs9<T);?=giA#?QrD<}EE%I7fY2~^LtB;O2sd|@U69MYhw^@Cy>4We}njvYmarRyb
zwxqs?C<|Vdx~Qt1j6;S=<IWfZ+3Px;&YRb!SB;vQ%&7B2V<`ovJADf?6H at ga5rL$_
z#w`XfZ>6<ur1kI&0WeuK5+=*pD1|+;z%hE;nD>p?x^9b}l3H(fzfH at pHcW_oW2oOb
z4DtzYvi(Bvf&I9bMtQxUX(l<J|F`f*H>vctdHb1k_A%5&<@?q>sP>+~QW^tvn*%y5
zk1q>&5O?G~IWGuLj(P=-_Fnbt(vu6UpKYJu*Y4t%o`@ET+rQT~V&jAHJ$IKYf;C4#
z2i(SX<;yEKbpxk1&Q+F^<@VX$MKtiA*zD?r)2C}qkC16jb!ac~Ck?TF41z8|GoUe0
z5>pdXwth1PFYpE0uHZAgx=-x&y7Ze+^1ey0fKbnyiOma_#K9DyRJ23#2757^48HP+
zY3H{eFT^aH&ekMDCd(z+sP%PGm8m&2HBXxYwyr)H>fX!1mlfc=Ab_3B?E8K{xmY at i
z2 at dLiR5rRbHK94zhiB|)A)=j=pr!Y!RCc1VgLP1#;~R$9L{)r!b=B!)Rb-_S`uklW
zv&Bhmv}$kiS*rOyd$Ntr$4&K=0_9P?ga%VHQv{POp5%m<dng%P8J6^;@B%IOO}J&z
z#N?_CZdKFN>Dm{3tr3r+WAkHMm!<{xn>iK7KCDlqn{w!2>#Gg{6v-mplTzT-_Itym
zob0cI$0tpjre&Ikg^fN3s~l6L2#l2WY}xYXXpD`;4@*?h?a)eX(Vwb*t)?G|xUaDE
z#abr^e7U!Yfln>*(#5*xgRD-E*|X<b2ow~5)EE>@mz<>BQa1ydR<_X at G0YhOXWA<P
zp#!<h$nNH`u=88a2B at +!dV<!5AiV*<)VE9lhphwU&rt_StPh~f*s?N42ba`!C%%{e
zMD8F_6C`BD1LK7L4QBmP-}2u)&);0j-;9~aKQd<jjF-W<f8u3eE)amn{-5YFpx-~k
zWgI`M*ZxMA{VYQHH&_FOa{dEV^D9TA^Z5r|hOx~rA7%JF7ZfY<;9h1tad4XeXB|db
z at Jgga5bC4t!_W<z7$>uXo26~K9Qqom7DN5BiR3D1<;$)alrr<*m<ZHr4(KCG2O1No
zADpU*TKWzgarbhzJx#RvxCe4SavK8ZGQQ;<Y<c11RnD5J$@bL at tMj^Atuu7A*BWBN
z3YfUbf=jiP>>DWe9E&VBs?S_B&f=SWdJTlzE8;1{Uy{*JFvE*#g(D>u?(OC?qk>PT
zpEWGRTjmI8ElFpwzkJKX++c_(6SnO(_m>-E*pFu&WI7A$8^dz#ntFTWPCr7?E$KQM
zm82lslfA^?6eh68OIK$wZ%<l!WY(8D>qfUE|J<z4i{Abc2P)l{`gDudD`fGU^v#~B
zGk)}*EuO=h2(32Dj at qj*>D+pIPvw2PfiO5<qxbYyS2%G!0E%_2WVQTLxWWD={{9_U
z{{txY-^SNJGGY*}-xx6@$Ax6Hez08tul17y`^kbKnJy%^g}g={Ke;jB92?1p{b0oY
z#g_eS|H+#n`7>nuKQLd&+)>2-mHGNn8}_%*{G}GE1W at J_xhnwg1p)m4>3+w<eo~-7
z6eHO=5XWB_CHqr^t)Y^!gBCkb+L>M1*x5nnHw%C4^HY6OWA>-|2qdxjmo-IWds|0@
zp|L%P<F7ibvc^W{`bZKK39WJQa)Ed_Av)}m2wO)uU|R{m`1Eb;;m9EjUD!pH007j<
z+|XE2QiNR!<NzRk0s`!!zytvc_8=q=sQ3%%`SUIV4D`e8|IgF;;gVmb^Jf$yr(=)J
z{^yopv;TWffc5-)Q;<%VHaD`@0wMWTMbHmg4=EJ2bp*B-$>sedTp at qLx}y33QEO`o
zxB{^FmnX2<<>AIQ!iGphSL?44+0`{PK{k$7R)0N#fw5)uZA=+W5Udi4OuzaW@(V&M
z?C4--i+Cs at E+GL10|5&LfJHD2IN=rrgCW564;j$*Q-*Bk<^>LM0bue#g>Qf#{@EP{
zr~!SD%`i^j73d3t0BS(k895pn|J36IhW;@Gp!-7~(BlM5aC86bKn at QD4nU5a0u(rh
zhy$-&KTQIw76VF+Gm7y+z#LF8jDv%N6HtOa07DqSU<RgNcGDSQY=R920SG2A(!U-c
zZZ0k;7sv$kmka_0LjZ3hA0V55$$)cYi2otufdGm0n+yWw;Qmtv2J>+Khm3;*3Z(QO
zeW6IS^EVlog9D&Qf0uDUAjo&B-}C?(u!28joX|h*azJ>1to%a{3i%Ja5D1v_&$$3H
z?mz89AP{aKK7X4FAmRq%`41T{1jv{_Ww8I~3+3eabG^XIeqFBvLLWfE5y+zRO6IP{
zfGgP*ZEb;^LFNf?)0DC?u?78zY2<|%NDK5(LKMO+CN2Wyg>Z`ti}DC_itq?SxB#a^
zcsU?qTrdIb|6K){oMN_yqGra1miCU;Aa*feF}z|DqGF=Jmcqn1IYeO`qT&z{2#g0J
d$|Wj}Ofh>0eT2i0kb^*hjKQX(6PK63{x1lfgiinf

literal 0
HcmV?d00001

-- 
1.7.9.5


From oleonard at myacpl.org  Thu Jul 11 19:07:59 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 11 Jul 2013 13:07:59 -0400
Subject: [Koha-patches] [PATCH] Bug 7598 - Acquisitions JavaScript contains
	untranslatable English strings
Message-ID: <1373562479-13121-1-git-send-email-oleonard@myacpl.org>

English strings in acq.js cannot be processed by the translation script.
This patch moves the strings to the templates to be set as JS variables
for use by the script.

To test:

- On the uncertain prices page, enter an invalid price and click save.
  You should see a JavaScript alert pointing this out.

- When adding a fund to an existing budget, enter an amount which
  exceeds the amount in the parent budget. You should see a JavaScript
  alert pointing this out. There is a similar function which has been
  corrected, checkBudgetParent(), but I don't know how to trigger it for
  testing.

The closebasketgroup function has been updated but as far as I can tell
it's not actually in use.
---
 koha-tmpl/intranet-tmpl/prog/en/js/acq.js          |   20 ++++++++++----------
 .../prog/en/modules/acqui/basketgroup.tt           |    6 ++++++
 .../prog/en/modules/acqui/uncertainprice.tt        |    1 +
 .../prog/en/modules/admin/aqbudgets.tt             |    7 +++++++
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
index b9039ea..b1fdf58 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
@@ -4,7 +4,7 @@
 function uncheckbox(form, field) {
     var price = new Number(form.elements['price' + field].value);
     var tmpprice = "";
-    var errmsg = _("ERROR: Price is not a valid number, please check the price and try again!")
+    var errmsg = MSG_INVALIDPRICE;
     if (isNaN(price)) {
         alert(errmsg);
         for(var i=0; i<form.elements['price' + field].value.length; ++i) {
@@ -335,7 +335,7 @@ function enterpressed(event){
 
 //Closes a basketgroup
 function closebasketgroup(bgid) {
-    var answer=confirm(_("Are you sure you want to close this basketgroup?"));
+    var answer = confirm(MSG_CONFIRM_CLOSE_BASKETGROUP);
     if(! answer){
         return;
     }
@@ -353,7 +353,7 @@ function closebasketgroup(bgid) {
     var ul = document.getElementById(ulid);
     var lis = ul.getElementsByTagName('li');
     if (lis.length == 0 ) {
-        alert(_("Why close an empty basket?"));
+        alert(MSG_CLOSE_EMPTY_BASKET);
         return;
     }
     var cantprint = document.createElement('p');
@@ -369,11 +369,11 @@ function closebasketgroup(bgid) {
     ddtarget.unreg();
     div.removeChild(stufftoremove);
 // the print button is disabled because the page's content might (or is probably) not in sync with what the database contains
-    cantprint.innerHTML=_("You need to save the page before printing");
+    cantprint.innerHTML = MSG_SAVE_BEFORE_PRINTING;
     cantprint.id = 'cantprint-' + bgid;
     var unclosegroup = document.createElement('a');
     unclosegroup.href='javascript:unclosegroup('+bgid+');';
-    unclosegroup.innerHTML=_("reopen basketgroup");
+    unclosegroup.innerHTML= MSG_REOPEN_BASKETGROUP;
     unclosegroup.id = 'unclose-' + bgid;
 
     div.appendChild(cantprint);
@@ -384,7 +384,7 @@ function closeandprint(bg){
 	if(document.location = '/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&amp;basketgroupid=' + bg ){
 		setTimeout("window.location.reload();",3000);
 	}else{
-		alert(_("Error downloading the file"));
+        alert(MSG_FILE_DOWNLOAD_ERROR);
 	}
 }
 
@@ -820,9 +820,9 @@ if ( newBudgetParent  ) { url +=  '&parent_id=' + newBudgetParent};
     var result = eval ( xmlhttp.responseText );
 
     if (result == '1') {
-            return _("- Budget total exceeds parent allocation\n");
+            return MSG_BUDGET_PARENT_ALLOCATION;
     } else if (result == '2') {
-            return _("- Budget total exceeds period allocation\n");
+            return MSG_BUDGET_PARENT_ALLOCATION;
     } else  {
             return false;
     }
@@ -854,7 +854,7 @@ function checkBudgetParent(budgetId, newBudgetParent) {
     var result = eval ( xmlhttp.responseText );
 
     if (result == '1') {
-            return _("- New budget-parent is beneath budget\n");
+            return MSG_PARENT_BENEATH_BUDGET;
 //     } else if (result == '2') {
 //            return "- New budget-parent has insufficent funds\n";
 //     } else  {
@@ -891,4 +891,4 @@ function hideAllColumns(){
     $("#selections span").removeClass("selected");
     $("#plan td:nth-child(2),#plan th:nth-child(2)").nextUntil("th:nth-child("+(allCols-1)+"),td:nth-child("+(allCols-1)+")").hide(); // hide all but the last two columns
     $("#hideall").attr("checked","checked").parent().addClass("selected");
-}
\ No newline at end of file
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
index 4c5e604..6bb0048 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -95,6 +95,12 @@ fieldset.various li {
 //<![CDATA[
 	YAHOO.util.Event.onDOMReady(DDApp.init, DDApp, true);
 
+var MSG_CONFIRM_CLOSE_BASKETGROUP = _("Are you sure you want to close this basketgroup?");
+var MSG_CLOSE_EMPTY_BASKET = _("Why close an empty basket?");
+var MSG_SAVE_BEFORE_PRINTING = _("You need to save the page before printing");
+var MSG_REOPEN_BASKETGROUP = _("reopen basketgroup");
+var MSG_FILE_DOWNLOAD_ERROR = _("Error downloading the file");
+
 function submitForm(form) {
     if (form.close.checked == true) {
 	var input = document.createElement("input");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
index 7bbad51..a7b5fc9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -15,6 +15,7 @@
         "sPaginationType": "four_button"
     } ) );
  });
+var MSG_INVALIDPRICE = _("ERROR: Price is not a valid number, please check the price and try again!");
  //]]>
 </script>
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index 7df04f3..44106ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -1,6 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo; Funds[% IF ( add_form ) %] &rsaquo; [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add fund [% END %][% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript">
+//<![CDATA[
+var MSG_BUDGET_PARENT_ALLOCATION = _("- Fund amount exceeds parent allocation\n");
+var MSG_PARENT_BENEATH_BUDGET = _("- New budget-parent is beneath budget\n");
+//]]>
+</script>
+
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 
 [% IF ( add_form ) %]
-- 
1.7.9.5

From januszop at gmail.com  Thu Jul 11 19:24:31 2013
From: januszop at gmail.com (Janusz Kaczmarek)
Date: Thu, 11 Jul 2013 19:24:31 +0200
Subject: [Koha-patches] [PATCH] Bug 10578 - Escaping CGI breaks results sort
	feature (librarian's interface)
Message-ID: <1373563471-13644-1-git-send-email-januszop@gmail.com>

To test  (in librarian's interface):

1. Have some biblio records to get a list when searching.
2. Make an advanced search with 'as phrase' modifier (title -- ti,phr:
or author -- au,phr: , etc.)
3. Having the result list try to change the sort order.
4. You should get no results with a message like: "No results match your
search for 'au%2Cphr: " etc.
5. Apply the patch
6. Repeat steps 2. & 3.
7. You should get the list sorted according to your choice.
---
 catalogue/search.pl |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/catalogue/search.pl b/catalogue/search.pl
index d4e98b1..768a801 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -148,6 +148,7 @@ use C4::Languages qw(getAllLanguages);
 use C4::Koha;
 use C4::Members qw(GetMember);
 use C4::VirtualShelves;
+use URI::Escape;
 use POSIX qw(ceil floor);
 use C4::Branch; # GetBranches
 
@@ -392,10 +393,12 @@ unless (@servers) {
 # operators include boolean and proximity operators and are used
 # to evaluate multiple operands
 my @operators = $cgi->param('op');
+ at operators = map { uri_unescape($_) } @operators;
 
 # indexes are query qualifiers, like 'title', 'author', etc. They
 # can be single or multiple parameters separated by comma: kw,right-Truncation 
 my @indexes = $cgi->param('idx');
+ at indexes = map { uri_unescape($_) } @indexes;
 
 # if a simple index (only one)  display the index used in the top search box
 if ($indexes[0] && (!$indexes[1] || $params->{'scan'})) {
@@ -407,9 +410,11 @@ if ($indexes[0] && (!$indexes[1] || $params->{'scan'})) {
 
 # an operand can be a single term, a phrase, or a complete ccl query
 my @operands = $cgi->param('q');
+ at operands = map { uri_unescape($_) } @operands;
 
 # limits are use to limit to results to a pre-defined category such as branch or language
 my @limits = $cgi->param('limit');
+ at limits = map { uri_unescape($_) } @limits;
 
 if($params->{'multibranchlimit'}) {
     my $multibranch = '('.join( " or ", map { "branch: $_ " } @{ GetBranchesInCategory( $params->{'multibranchlimit'} ) } ).')';
-- 
1.7.2.5


From srdjan at catalyst.net.nz  Tue Jul 16 02:09:07 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Tue, 16 Jul 2013 12:09:07 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 10556: The delivery time is
	not inserted on adding a supplier.
Message-ID: <1373933347-26719-1-git-send-email-srdjan@catalyst.net.nz>

From: Jonathan Druart <jonathan.druart at biblibre.com>

Test plan:
Add/edit a supplier and check that the delivery time is set in DB.

Note: This patch cleans the code (sql query) in order to see easily if a
problem occurred.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Bookseller.pm | 92 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm
index c8389a3..10f4d80 100644
--- a/C4/Bookseller.pm
+++ b/C4/Bookseller.pm
@@ -175,32 +175,31 @@ sub AddBookseller {
     my $query  = q|
         INSERT INTO aqbooksellers
             (
-                name,      address1,      address2,   address3,      address4,
-                postal,    phone,         accountnumber,   fax,      url,           
-                contact,
-                contpos,   contphone,     contfax,    contaltphone,  contemail,
-                contnotes, active,        listprice,  invoiceprice,  gstreg,
-                listincgst,invoiceincgst, gstrate,    discount,
-                notes
+                name,      address1,      address2,     address3,   address4,
+                postal,    phone,         accountnumber,fax,        url,
+                contact,   contpos,       contphone,    contfax,    contaltphone,
+                contemail, contnotes,     active,       listprice,  invoiceprice,
+                gstreg,    listincgst,    invoiceincgst,gstrate,    discount,
+                notes,     deliverytime
             )
-        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |
+        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |
       ;
     my $sth = $dbh->prepare($query);
     $sth->execute(
-        $data->{'name'},         $data->{'address1'},
-        $data->{'address2'},     $data->{'address3'},
-        $data->{'address4'},     $data->{'postal'},
-        $data->{'phone'},        $data->{'accountnumber'},
-        $data->{'fax'},
-        $data->{'url'},          $data->{'contact'},
-        $data->{'contpos'},      $data->{'contphone'},
-        $data->{'contfax'},      $data->{'contaltphone'},
-        $data->{'contemail'},    $data->{'contnotes'},
-        $data->{'active'},       $data->{'listprice'},
-        $data->{'invoiceprice'}, $data->{'gstreg'},
-        $data->{'listincgst'},   $data->{'invoiceincgst'},
-        $data->{'gstrate'},
-        $data->{'discount'},     $data->{'notes'}
+        $data->{name}         ,$data->{address1},
+        $data->{address2}     ,$data->{address3},
+        $data->{address4}     ,$data->{postal},
+        $data->{phone}        ,$data->{accountnumber},
+        $data->{fax},
+        $data->{url}          ,$data->{contact},
+        $data->{contpos}      ,$data->{contphone},
+        $data->{contfax}      ,$data->{contaltphone},
+        $data->{contemail}    ,$data->{contnotes},
+        $data->{active}       ,$data->{listprice},
+        $data->{invoiceprice} ,$data->{gstreg},
+        $data->{listincgst}   ,$data->{invoiceincgst},
+        $data->{gstrate}      ,$data->{discount},
+        $data->{notes}        ,$data->{deliverytime},
     );
 
     # return the id of this new supplier
@@ -227,32 +226,33 @@ C<&ModBookseller> with the result.
 sub ModBookseller {
     my ($data) = @_;
     my $dbh    = C4::Context->dbh;
-    my $query  = 'UPDATE aqbooksellers
-        SET name=?,address1=?,address2=?,address3=?,address4=?,
-            postal=?,phone=?,accountnumber=?,fax=?,url=?,contact=?,contpos=?,
-            contphone=?,contfax=?,contaltphone=?,contemail=?,
-            contnotes=?,active=?,listprice=?, invoiceprice=?,
-            gstreg=?,listincgst=?,invoiceincgst=?,
-            discount=?,notes=?,gstrate=?,deliverytime=?
-        WHERE id=?';
+    my $query  = q|
+        UPDATE aqbooksellers
+        SET name = ?,      address1 = ?,     address2 = ?,      address3 = ?,  address4 = ?,
+            postal = ?,    phone = ?,        accountnumber = ?, fax = ?,       url = ?,
+            contact = ?,   contpos = ?,      contphone = ?,     contfax = ?,   contaltphone = ?,
+            contemail = ?, contnotes = ?,    active = ?,        listprice = ?, invoiceprice = ?,
+            gstreg = ?,    listincgst = ?,   invoiceincgst = ?, gstrate = ?,   discount = ?,
+            notes = ?,     deliverytime = ?
+        WHERE id=?
+    |;
     my $sth = $dbh->prepare($query);
     $sth->execute(
-        $data->{'name'},         $data->{'address1'},
-        $data->{'address2'},     $data->{'address3'},
-        $data->{'address4'},     $data->{'postal'},
-        $data->{'phone'},        $data->{'accountnumber'},
-        $data->{'fax'},
-        $data->{'url'},          $data->{'contact'},
-        $data->{'contpos'},      $data->{'contphone'},
-        $data->{'contfax'},      $data->{'contaltphone'},
-        $data->{'contemail'},    $data->{'contnotes'},
-        $data->{'active'},       $data->{'listprice'},
-        $data->{'invoiceprice'}, $data->{'gstreg'},
-        $data->{'listincgst'},   $data->{'invoiceincgst'},
-        $data->{'discount'},     $data->{'notes'},
-        $data->{'gstrate'},
-        $data->{deliverytime},
-        $data->{'id'}
+        $data->{name}         ,$data->{address1},
+        $data->{address2}     ,$data->{address3},
+        $data->{address4}     ,$data->{postal},
+        $data->{phone}        ,$data->{accountnumber},
+        $data->{fax},
+        $data->{url}          ,$data->{contact},
+        $data->{contpos}      ,$data->{contphone},
+        $data->{contfax}      ,$data->{contaltphone},
+        $data->{contemail}    ,$data->{contnotes},
+        $data->{active}       ,$data->{listprice},
+        $data->{invoiceprice} ,$data->{gstreg},
+        $data->{listincgst}   ,$data->{invoiceincgst},
+        $data->{gstrate}      ,$data->{discount},
+        $data->{notes}        ,$data->{deliverytime},
+        $data->{id},
     );
     return;
 }
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Tue Jul 16 02:47:30 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Tue, 16 Jul 2013 12:47:30 +1200
Subject: [Koha-patches] [PATCH] Bug 10197: Add classes to patron info list
Message-ID: <1373935650-30645-1-git-send-email-srdjan@catalyst.net.nz>

From: "Nicole C. Engard" <nengard at bywatersolutions.com>

This patch adds classes to the patron info found on the
top left of the circulation and patron related pages to
allow for easy styling of the information displayed.

To test:

* Apply patch
* View a patron detail page and view the source on the list to the
  left to see the styles
* View a checkout screen and view the source on the list to the
  left with patron info to see the styles
* You could also try to style things by customizing your CSS

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc | 18 +++++++++---------
 koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt  | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index 7101260..4632467 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -4,31 +4,31 @@
 <style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
 }</style>
 <![endif]-->
-<ul>
+<ul class="patronbriefinfo">
 [% IF ( patronimages ) %]
 [% IF ( picture ) %]
 <li><img src="/cgi-bin/koha/members/patronimage.pl?crdnum=[% cardnumber | uri %]" id="patronimage" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li>
 [% ELSE %]
-<li><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
+<li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
 [% END %]
 [% END %]
     [% IF ( address or address2 ) %]
         [% IF ( address ) %]
-            <li>[% address %]</li>
+            <li class="patronaddress1">[% address %]</li>
         [% END %]
         [% IF ( address2 ) %]
-            <li>[% address2 %]</li>
+            <li class="patronaddress2">[% address2 %]</li>
         [% END %]
     [% ELSE %]
             <li><span class="empty" id="noadressstored">No address stored.</span></li>
     [% END %]
-    <li>[% IF ( city ) %]
+    <li class="patroncity">[% IF ( city ) %]
             [% city %][% IF ( state ) %], [% state %][% END %]
 	    [% zipcode %][% IF ( country ) %], [% country %][% END %]
     [% ELSE %]
         <span class="empty" id="nocitystored">No city stored.</span>
     [% END %]</li>
-    <li>[% IF ( phone ) %]
+    <li class="patronphone">[% IF ( phone ) %]
         [% phone %]
     [% ELSE %]
         [% IF ( mobile ) %]
@@ -53,12 +53,12 @@
     [% IF ( ExtendedPatronAttributes ) %][% FOREACH extendedattribute IN extendedattributes %]
         [% IF ( extendedattribute.display_checkout ) %]
             [% IF ( extendedattribute.value ) %]
-                <li>[% extendedattribute.description %] : [% IF ( extendedattribute.value_description ) %][% extendedattribute.value_description %][% ELSE %][% extendedattribute.value %][% END %]</li>
+                <li class="patronattribute"><span class="patronattributelabel">[% extendedattribute.description %]</span> : [% IF ( extendedattribute.value_description ) %][% extendedattribute.value_description %][% ELSE %][% extendedattribute.value %][% END %]</li>
             [% END %]
         [% END %]
     [% END %][% END %]
-    <li>Category: [% categoryname %] ([% categorycode %])</li>
-    <li>Home library: [% IF ( branchname ) %][% branchname %][% ELSE %][% branch %][% END %]</li>
+    <li class="patroncategory">Category: [% categoryname %] ([% categorycode %])</li>
+    <li class="patronlibrary">Home library: [% IF ( branchname ) %][% branchname %][% ELSE %][% branch %][% END %]</li>
 </ul></div>
 <div id="menu">
 <ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
index 1b91a3c..8d52b90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
@@ -6,32 +6,32 @@ in the global namespace %]
 <style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
 }</style>
 <![endif]-->
-<ul>
+<ul class="patronbriefinfo">
 [% IF ( patronimages ) %]
 [% IF borrower.has_picture %]
 <li><img src="/cgi-bin/koha/members/patronimage.pl?crdnum=[% borrower.cardnumber %]" id="patronimage" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li>
 [% ELSE %]
-<li><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
+<li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
 [% END %]
 [% END %]
     [% IF ( borrower.address or borrower.address2 ) %]
         [% IF ( borrower.address ) %]
-            <li>[% borrower.address %]</li>
+            <li class="patronaddress1">[% borrower.address %]</li>
         [% END %]
         [% IF ( borrower.address2 ) %]
-            <li>[% borrower.address2 %]</li>
+            <li class="patronaddress2">[% borrower.address2 %]</li>
         [% END %]
     [% ELSE %]
             <li><span class="empty" id="noaddressstored">No address stored.</span></li>
     [% END %]
-    <li>
+    <li class="patroncity">
     [% IF borrower.city %]
             [% borrower.city %][% IF borrower.state %], [% borrower.state %][% END %]
 	    [% borrower.zipcode %][% IF ( borrower.country ) %], [% borrower.country %][% END %]
     [% ELSE %]
         <span class="empty" id="nocitystored">No city stored.</span>
     [% END %]</li>
-    <li>[% IF borrower.phone %]
+    <li class="patronphone">[% IF borrower.phone %]
         [% borrower.phone %]
     [% ELSE %]
         [% IF borrower.mobile %]
@@ -56,12 +56,12 @@ in the global namespace %]
     [% IF ( ExtendedPatronAttributes ) %][% FOREACH extendedattribute IN borrower.extendedattributes %]
         [% IF ( extendedattribute.display_checkout ) %]
             [% IF ( extendedattribute.value ) %]
-                <li>[% extendedattribute.description %] : [% IF ( extendedattribute.value_description ) %][% extendedattribute.value_description %][% ELSE %][% extendedattribute.value %][% END %]</li>
+                <li class="patronattribute"><span class="patronattributelabel">[% extendedattribute.description %]</span> : [% IF ( extendedattribute.value_description ) %][% extendedattribute.value_description %][% ELSE %][% extendedattribute.value %][% END %]</li>
             [% END %]
         [% END %]
     [% END %][% END %]
-    <li>Category: [% borrower.description %] ([% borrower.categorycode %])</li>
-    <li>Home library: [% IF ( borrower.branchname ) %][% borrower.branchname %][% ELSE %][% borrower.branch %][% END %]</li>
+    <li class="patroncategory">Category: [% borrower.description %] ([% borrower.categorycode %])</li>
+    <li class="patronlibrary">Home library: [% IF ( borrower.branchname ) %][% borrower.branchname %][% ELSE %][% borrower.branch %][% END %]</li>
 </ul></div>
 <div id="menu">
 <ul>
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Tue Jul 16 08:37:39 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Tue, 16 Jul 2013 18:37:39 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 7598 - Acquisitions
	JavaScript contains untranslatable English strings
Message-ID: <1373956659-31226-1-git-send-email-srdjan@catalyst.net.nz>

From: Owen Leonard <oleonard at myacpl.org>

English strings in acq.js cannot be processed by the translation script.
This patch moves the strings to the templates to be set as JS variables
for use by the script.

To test:

- On the uncertain prices page, enter an invalid price and click save.
  You should see a JavaScript alert pointing this out.

- When adding a fund to an existing budget, enter an amount which
  exceeds the amount in the parent budget. You should see a JavaScript
  alert pointing this out. There is a similar function which has been
  corrected, checkBudgetParent(), but I don't know how to trigger it for
  testing.

The closebasketgroup function has been updated but as far as I can tell
it's not actually in use.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 koha-tmpl/intranet-tmpl/prog/en/js/acq.js            | 20 ++++++++++----------
 .../prog/en/modules/acqui/basketgroup.tt             |  6 ++++++
 .../prog/en/modules/acqui/uncertainprice.tt          |  1 +
 .../intranet-tmpl/prog/en/modules/admin/aqbudgets.tt |  7 +++++++
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
index b9039ea..b1fdf58 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
@@ -4,7 +4,7 @@
 function uncheckbox(form, field) {
     var price = new Number(form.elements['price' + field].value);
     var tmpprice = "";
-    var errmsg = _("ERROR: Price is not a valid number, please check the price and try again!")
+    var errmsg = MSG_INVALIDPRICE;
     if (isNaN(price)) {
         alert(errmsg);
         for(var i=0; i<form.elements['price' + field].value.length; ++i) {
@@ -335,7 +335,7 @@ function enterpressed(event){
 
 //Closes a basketgroup
 function closebasketgroup(bgid) {
-    var answer=confirm(_("Are you sure you want to close this basketgroup?"));
+    var answer = confirm(MSG_CONFIRM_CLOSE_BASKETGROUP);
     if(! answer){
         return;
     }
@@ -353,7 +353,7 @@ function closebasketgroup(bgid) {
     var ul = document.getElementById(ulid);
     var lis = ul.getElementsByTagName('li');
     if (lis.length == 0 ) {
-        alert(_("Why close an empty basket?"));
+        alert(MSG_CLOSE_EMPTY_BASKET);
         return;
     }
     var cantprint = document.createElement('p');
@@ -369,11 +369,11 @@ function closebasketgroup(bgid) {
     ddtarget.unreg();
     div.removeChild(stufftoremove);
 // the print button is disabled because the page's content might (or is probably) not in sync with what the database contains
-    cantprint.innerHTML=_("You need to save the page before printing");
+    cantprint.innerHTML = MSG_SAVE_BEFORE_PRINTING;
     cantprint.id = 'cantprint-' + bgid;
     var unclosegroup = document.createElement('a');
     unclosegroup.href='javascript:unclosegroup('+bgid+');';
-    unclosegroup.innerHTML=_("reopen basketgroup");
+    unclosegroup.innerHTML= MSG_REOPEN_BASKETGROUP;
     unclosegroup.id = 'unclose-' + bgid;
 
     div.appendChild(cantprint);
@@ -384,7 +384,7 @@ function closeandprint(bg){
 	if(document.location = '/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&amp;basketgroupid=' + bg ){
 		setTimeout("window.location.reload();",3000);
 	}else{
-		alert(_("Error downloading the file"));
+        alert(MSG_FILE_DOWNLOAD_ERROR);
 	}
 }
 
@@ -820,9 +820,9 @@ if ( newBudgetParent  ) { url +=  '&parent_id=' + newBudgetParent};
     var result = eval ( xmlhttp.responseText );
 
     if (result == '1') {
-            return _("- Budget total exceeds parent allocation\n");
+            return MSG_BUDGET_PARENT_ALLOCATION;
     } else if (result == '2') {
-            return _("- Budget total exceeds period allocation\n");
+            return MSG_BUDGET_PARENT_ALLOCATION;
     } else  {
             return false;
     }
@@ -854,7 +854,7 @@ function checkBudgetParent(budgetId, newBudgetParent) {
     var result = eval ( xmlhttp.responseText );
 
     if (result == '1') {
-            return _("- New budget-parent is beneath budget\n");
+            return MSG_PARENT_BENEATH_BUDGET;
 //     } else if (result == '2') {
 //            return "- New budget-parent has insufficent funds\n";
 //     } else  {
@@ -891,4 +891,4 @@ function hideAllColumns(){
     $("#selections span").removeClass("selected");
     $("#plan td:nth-child(2),#plan th:nth-child(2)").nextUntil("th:nth-child("+(allCols-1)+"),td:nth-child("+(allCols-1)+")").hide(); // hide all but the last two columns
     $("#hideall").attr("checked","checked").parent().addClass("selected");
-}
\ No newline at end of file
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
index 4c5e604..6bb0048 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -95,6 +95,12 @@ fieldset.various li {
 //<![CDATA[
 	YAHOO.util.Event.onDOMReady(DDApp.init, DDApp, true);
 
+var MSG_CONFIRM_CLOSE_BASKETGROUP = _("Are you sure you want to close this basketgroup?");
+var MSG_CLOSE_EMPTY_BASKET = _("Why close an empty basket?");
+var MSG_SAVE_BEFORE_PRINTING = _("You need to save the page before printing");
+var MSG_REOPEN_BASKETGROUP = _("reopen basketgroup");
+var MSG_FILE_DOWNLOAD_ERROR = _("Error downloading the file");
+
 function submitForm(form) {
     if (form.close.checked == true) {
 	var input = document.createElement("input");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
index 7bbad51..a7b5fc9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -15,6 +15,7 @@
         "sPaginationType": "four_button"
     } ) );
  });
+var MSG_INVALIDPRICE = _("ERROR: Price is not a valid number, please check the price and try again!");
  //]]>
 </script>
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index 7df04f3..44106ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -1,6 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo; Funds[% IF ( add_form ) %] &rsaquo; [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add fund [% END %][% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript">
+//<![CDATA[
+var MSG_BUDGET_PARENT_ALLOCATION = _("- Fund amount exceeds parent allocation\n");
+var MSG_PARENT_BENEATH_BUDGET = _("- New budget-parent is beneath budget\n");
+//]]>
+</script>
+
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 
 [% IF ( add_form ) %]
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Wed Jul 17 01:19:37 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 17 Jul 2013 11:19:37 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 10557:
	GetBooksellersWithLateOrders has an unused branch parameter
Message-ID: <1374016777-18046-1-git-send-email-srdjan@catalyst.net.nz>

From: Jonathan Druart <jonathan.druart at biblibre.com>

C4::Booksellers::GetBooksellersWithLateOrders has an unused parameter.
The $branch variable is never used in the routine.

Test plan:
Check that no behavior changes on the late orders page.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Bookseller.pm    | 4 ++--
 acqui/lateorders.pl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm
index 2471380..3e1454f 100644
--- a/C4/Bookseller.pm
+++ b/C4/Bookseller.pm
@@ -98,14 +98,14 @@ sub GetBookSellerFromId {
 
 =head2 GetBooksellersWithLateOrders
 
-%results = GetBooksellersWithLateOrders($delay);
+%results = GetBooksellersWithLateOrders( $delay, $estimateddeliverydatefrom, $estimateddeliverydateto );
 
 Searches for suppliers with late orders.
 
 =cut
 
 sub GetBooksellersWithLateOrders {
-    my ( $delay, $branch, $estimateddeliverydatefrom, $estimateddeliverydateto ) = @_;    # FIXME: Branch argument unused.
+    my ( $delay, $estimateddeliverydatefrom, $estimateddeliverydateto ) = @_;
     my $dbh = C4::Context->dbh;
 
     # FIXME NOT quite sure that this operation is valid for DBMs different from Mysql, HOPING so
diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index 7c2b3f3..d732357 100755
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -118,7 +118,7 @@ if ($op and $op eq "send_alert"){
     }
 }
 
-my @parameters = ( $delay, $branch );
+my @parameters = ( $delay );
 push @parameters, $estimateddeliverydatefrom_dt
     ? $estimateddeliverydatefrom_dt->ymd()
     : undef;
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Wed Jul 17 02:01:49 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 17 Jul 2013 12:01:49 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 2394: Use syspref
	canreservefromotherbranches in CanItemBeReserved
Message-ID: <1374019309-22153-1-git-send-email-srdjan@catalyst.net.nz>

From: Julian Maurice <julian.maurice at biblibre.com>

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Reserves.pm | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 5ff12e4..182af1a 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -491,11 +491,22 @@ sub CanItemBeReserved{
     }
     
     # we check if it's ok or not
-    if( $reservecount < $allowedreserves ){
-        return 1;
-    }else{
+    if( $reservecount >= $allowedreserves ){
         return 0;
     }
+
+    # If reservecount is ok, we check item branch if IndependentBranches is ON
+    # and canreservefromotherbranches is OFF
+    if ( C4::Context->preference('IndependentBranches')
+        and !C4::Context->preference('canreservefromotherbranches') )
+    {
+        my $itembranch = $item->{homebranch};
+        if ($itembranch ne $borrower->{branchcode}) {
+            return 0;
+        }
+    }
+
+    return 1;
 }
 #--------------------------------------------------------------------------------
 =head2 GetReserveCount
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Wed Jul 17 02:11:06 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 17 Jul 2013 12:11:06 +1200
Subject: [Koha-patches] [PATCH] Bug 2394: Use syspref
	canreservefromotherbranches in CanItemBeReserved
Message-ID: <1374019866-23124-1-git-send-email-srdjan@catalyst.net.nz>

From: Julian Maurice <julian.maurice at biblibre.com>

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Reserves.pm | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index c8b0cdd..87ffaff 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -491,11 +491,22 @@ sub CanItemBeReserved{
     }
     
     # we check if it's ok or not
-    if( $reservecount < $allowedreserves ){
-        return 1;
-    }else{
+    if( $reservecount >= $allowedreserves ){
         return 0;
     }
+
+    # If reservecount is ok, we check item branch if IndependantBranches is ON
+    # and canreservefromotherbranches is OFF
+    if ( C4::Context->preference('IndependantBranches')
+        and !C4::Context->preference('canreservefromotherbranches') )
+    {
+        my $itembranch = $item->{homebranch};
+        if ($itembranch ne $borrower->{branchcode}) {
+            return 0;
+        }
+    }
+
+    return 1;
 }
 #--------------------------------------------------------------------------------
 =head2 GetReserveCount
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Wed Jul 17 02:20:16 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 17 Jul 2013 12:20:16 +1200
Subject: [Koha-patches] [PATCH] Bug 10597 - Search to hold button broken on
	record details
Message-ID: <1374020416-24022-1-git-send-email-srdjan@catalyst.net.nz>

From: Kyle M Hall <kyle at bywatersolutions.com>

The holds button in cat-toolbar is broken for "search to hold". It is a
split button rather than a dropdown button. Clicking the caret works
fine, but clicked the button sends you to the marc editor!

Test Plan:
1) View a patron's details page
2) Click 'search to hold'
3) Search for something
4) On the results page, click a result line's title link (
    catalogue/detail.pl )
5) Note the "Place hold" button is a split button, click the left half
    of the button, note it redirects you to the editor.
6) Apply this patch
7) Repeat steps 1-5

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index 3683ac9..553d9ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -204,14 +204,15 @@ CAN_user_serials_create_subscription ) %]
     [% UNLESS ( norequests ) %]
         [% IF ( holdfor ) %]
             <div class="btn-group">
-            <button class="btn btn-small"><i class="icon-hold"></i> Place hold</button>
-            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
-                <span class="caret"></span>
-            </button>
-            <ul class="dropdown-menu">
-                <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]">Place hold</a></li>
-                <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]&amp;findborrower=[% holdfor_cardnumber %]">Place hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])</a></li>
-            </ul>
+                <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
+                    <i class="icon-hold"></i>
+                    Place hold
+                    <span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu">
+                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]">Place hold</a></li>
+                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]&amp;findborrower=[% holdfor_cardnumber %]">Place hold for [% holdfor_firstname %] [% holdfor_surname %] ([% holdfor_cardnumber %])</a></li>
+                </ul>
             </div>
         [% ELSE %]
             <div class="btn-group"><a id="placehold" class="btn btn-small" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]"><i class="icon-hold"></i> Place hold</a></div>
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Wed Jul 17 03:31:12 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 17 Jul 2013 13:31:12 +1200
Subject: [Koha-patches] [PATCH] Bug 10595 - OpacTopissue page still
	accessible when system preference is turned off
Message-ID: <1374024672-29838-1-git-send-email-srdjan@catalyst.net.nz>

From: Mirko Tietgen <mirko at abunchofthings.net>

When the syspref is turned off, the link is hidden but the page is still accessible. This patch checks the syspref and redirects to 404 if it is disabled.

Test plan:

Before applying the patch

Enable OpacTopissue
  Observe there is a link to opac-topissues.pl next to Advanced search etc.
  Follow that link, observe that opac-topissues.pl is loading
Disable OpacTopissue
  Observe the link is gone
  Manually open /koha/opac-topissues.pl and check that it is loading even though the feature is disabled

Apply patch

(OpacTopissue still diabled)
Manually open /koha/opac-topissues.pl and observe that you are being redirected to the 404 page.
Enable OpacTopissue
  Follow the link or manuall open opac-topissues.pl and check that it is working

Signoff the patch.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 opac/opac-topissues.pl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl
index 96b0c8f..95291d0 100755
--- a/opac/opac-topissues.pl
+++ b/opac/opac-topissues.pl
@@ -40,6 +40,13 @@ plugin that shows a stats on borrowers
 =cut
 
 my $input = new CGI;
+
+# if OpacTopissue is disabled, leave immediately
+if ( ! C4::Context->preference('OpacTopissue') ) {
+    print $input->redirect("/cgi-bin/koha/errors/404.pl");
+    exit;
+}
+
 my $branches = GetBranches();
 my $itemtypes = GetItemTypes();
 
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Wed Jul 17 04:36:28 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 17 Jul 2013 14:36:28 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 10543 - false mandatory
	warning in additem
Message-ID: <1374028588-3895-1-git-send-email-srdjan@catalyst.net.nz>

From: Fridolyn SOMERS <fridolyn.somers at biblibre.com>

When editing a item, you get a popup warning :
  "1 mandatory fields empty (highlighted)".
But all mandatory fields are filled.
This is because there is a field with a huge content (more than 100 characters), it it displayed in a textarea instead of input.
This patch corrects javascript form check by using siblings().
Also adds a more precise filter to find mandatory inputs because looking in full page may bring unwanted results.

Test plan :
- In a framework, make sure you have in item field :
  An optionnal subfield (without authorised value) then a mandatory subfield then an optional subfield next to mandatory subfield
  For example : $i (optional), $r (mandatory) and $s (optional)
- Open a biblio record and create a new item
- Enter more than 100 characters in $i, fill $r and $s
- Click "Add item"
- Edit this item
=> You get a textarea for $i
- Empty $s and Save
=> Without patch, you get a warning and form is not saved and you see that $s is yellow while it should be $r
=> With patch, form is saved
- Re-edit this item
- Empty $r and save
=> You get a warning and form is not saved

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 koha-tmpl/intranet-tmpl/prog/en/js/cataloging.js   | 17 +++++++++++++++++
 .../prog/en/modules/cataloguing/additem.tt         | 22 +++++-----------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/cataloging.js b/koha-tmpl/intranet-tmpl/prog/en/js/cataloging.js
index 614e698..6b49579 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/cataloging.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/cataloging.js
@@ -464,3 +464,20 @@ function CloneItemSubfield(original){
     // insert this line on the page
     original.parentNode.insertBefore(clone,original.nextSibling);
 }
+
+/**
+ * Check mandatory subfields of a cataloging form and adds <code>missing</code> class to those who are empty.<br>
+ * @param p the parent object of subfields to check
+ * @return the number of empty mandatory subfields
+ */
+function CheckMandatorySubfields(p){
+    var total = 0;
+    $(p).find(".subfield_line input[name='mandatory'][value='1']").each(function(i){
+        var editor = $(this).siblings("[name='field_value']");
+        if (!editor.val()) {
+            editor.addClass("missing");
+            total++;
+        }
+    });
+    return total;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index 74b6d30..3c385a6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -40,27 +40,15 @@ function active(numlayer)
     }
 }
 function Check(f) {
-    var total_errors=0;
-    $("input[name='mandatory'],select[name='mandatory']").each(function(i){
-        if($(this).val() == 1){
-            var mandatory_field = $("input[name='field_value'],select[name='field_value']").eq(i);
-            if(mandatory_field.val() == ''){
-                mandatory_field.addClass("missing");
-                total_errors++;
-            }
-        }
-    });
-
-    var alertString2;
-    if (total_errors==0) {
-        return true;
-    } else {
-        alertString2  = _("Form not submitted because of the following problem(s)");
+    var total_errors = CheckMandatorySubfields(f);
+    if (total_errors > 0) {
+        var alertString2 = _("Form not submitted because of the following problem(s)");
         alertString2 += "\n------------------------------------------------------------------------------------\n";
-        alertString2 += "\n- "+ total_errors+_(" mandatory fields empty (highlighted)");
+        alertString2 += "\n- "+ total_errors + _(" mandatory fields empty (highlighted)");
         alert(alertString2);
         return false;
     }
+    return true;
 }
 function CheckMultipleAdd(f) {
 
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Wed Jul 17 04:38:10 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 17 Jul 2013 14:38:10 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 10543 - Unify item
	mandatory subfields check
Message-ID: <1374028690-4107-1-git-send-email-srdjan@catalyst.net.nz>

From: Fridolyn SOMERS <fridolyn.somers at biblibre.com>

Use of CheckMandatorySubfields from cataloging.js everywhere an item cataloging form is checked for mandatories

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 .../intranet-tmpl/prog/en/modules/acqui/neworderempty.tt  |  9 ++-------
 .../intranet-tmpl/prog/en/modules/acqui/orderreceive.tt   | 15 +++------------
 .../intranet-tmpl/prog/en/modules/serials/serials-edit.tt | 14 ++++++--------
 3 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index bbcd4e8..52def80 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -6,6 +6,7 @@
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 [% INCLUDE 'additem.js.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/additem.js"></script>
+<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
 <script type="text/javascript" src="[% themelang %]/js/prevent_submit.js"></script>
 <script type="text/javascript">
 //<![CDATA[
@@ -64,13 +65,7 @@ function Check(ff) {
     }
 
     if ( ff.field_value ) {
-        var empty_item_mandatory = 0;
-        for (i = 0; i < ff.field_value.length; i++) {
-            //alert("i = " + i + " => " + ff.kohafield[i] );
-            if (ff.field_value[i].value.length == 0 && ff.mandatory[i].value == 1) {
-                empty_item_mandatory++;
-            }
-        }
+        var empty_item_mandatory = CheckMandatorySubfields(ff);
         if (empty_item_mandatory > 0) {
             ok = 1;
             _alertString +=
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index 0f454c0..67999e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -2,23 +2,14 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; Receipt summary for : [% name %] [% IF ( invoice ) %]invoice, [% invoice %][% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'additem.js.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/additem.js"> </script>
+<script type="text/javascript" src="[% themelang %]/js/additem.js"></script>
+<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
 <script type="text/javascript" src="[% themelang %]/js/prevent_submit.js"></script>
 <script type="text/javascript">
 //<![CDATA[
     function Check(form) {
         [% IF (AcqCreateItemReceiving) %]
-            var total_errors=0;
-            $("input[name='mandatory'],select[name='mandatory']").each(function(i){
-                if($(this).val() == 1){
-                    var mandatory_field = $("input[name='field_value'],select[name='field_value']").eq(i);
-                    if(mandatory_field.val() == ''){
-                        mandatory_field.addClass("missing");
-                        total_errors++;
-                    }
-                }
-            });
-
+            var total_errors = CheckMandatorySubfields(form);
             if (total_errors != 0) {
                 var alertString = _("Form not submitted because of the following problem(s)");
                 alertString += "\n------------------------------------------------------------------------------------\n";
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
index d0936d4..8f9ea5f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
@@ -78,21 +78,19 @@ function changeDate2(adate) {
 }
 
 $(document).ready(function() {
-	$("form#serials_edit").submit(function() {
-	    var total_errors = 0;
-        $(".subfield_line:visible", this).each(function() {
-            if ($("*[name=field_value]", this).val().length == 0 &&
-                $("*[name=mandatory]", this).val() == 1) {
-                total_errors++;
-            }
+    $("form#serials_edit").submit(function() {
+        var total_errors = 0;
+        $(this).find(".cataloguing_additem_itemlist:visible").each(function(){
+            total_errors = total_errors + CheckMandatorySubfields(this);
         });
         if ( total_errors > 0 ) {
             var mes  = _("Form not submitted because of the following problem(s)");
             mes += "\n------------------------------------------------------------------------------------\n";
-            mes += "\n- "+ total_errors+_(" mandatory fields empty (see bold subfields)");
+            mes += "\n- " + total_errors + _(" mandatory fields empty (highlighted)");
             alert(mes);
             return false;
         }
+        return true;
     });
 });
 //]]>
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Wed Jul 17 04:38:54 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 17 Jul 2013 14:38:54 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 10543 - add mandatory
	subfield check to addorderiso2709.pl
Message-ID: <1374028734-4211-1-git-send-email-srdjan@catalyst.net.nz>

From: Fridolyn SOMERS <fridolyn.somers at biblibre.com>

When adding orders from staged file, you can create one order per record using item form in the bottom of addorderiso2709.pl.
This form was missing check.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 .../intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index 3627077..7e87f5e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -13,6 +13,7 @@
 [% INCLUDE 'datatables-strings.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
+<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
 <script type="text/JavaScript">
 //<![CDATA[
     [% IF (dateformat == 'metric') %]
@@ -25,6 +26,18 @@
             ],
             "sPaginationType": "four_button"
         } ) );
+        
+        $("form#Aform").submit(function() {
+            var total_errors = CheckMandatorySubfields(this);
+            if (total_errors > 0) {
+                var alertString  = _("Form not submitted because of the following problem(s)");
+                alertString += "\n------------------------------------------------------------------------------------\n";
+                alertString += "\n- "+ total_errors + _(" mandatory fields empty (highlighted)");
+                alert(alertString);
+                return false;
+            }
+            return true;
+        });
     });
 //]]>
 </script>
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Wed Jul 17 05:04:54 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 17 Jul 2013 15:04:54 +1200
Subject: [Koha-patches] [PATCH] Bug 7019: Circulation History Sort Order
	Wrong (in datatable)
Message-ID: <1374030294-6530-1-git-send-email-srdjan@catalyst.net.nz>

From: Fridolyn SOMERS <fridolyn.somers at biblibre.com>

The "return date" column sort is not using the date sort algorithm because it is
confused by the combination of date data and text data ("Checked out").

This patch adds the use of datatable "title-string" sort type.
With that, the date in ISO format are used for sorting and because letters are before numbers, "Checked out" rows are more recent than any date.

Test plan :
- set dateformat syspref to "dd/mm/yyyy"
- Go to members/readingrec.pl for a borrower having a old issues and
checked out issues
=> Check that sort of "Return date" is correct.
For example :
With patch :
  20/01/2011
  06/03/2011
  20/03/2011
  Checked Out
Without patch :
  06/03/2011
  20/01/2011
  20/03/2011
  Checked Out
- Test also with dateformat syspref "mm/dd/yyyy"

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 .../intranet-tmpl/prog/en/modules/members/readingrec.tt    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
index f488234..f36e254 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
@@ -26,7 +26,7 @@
             null,
             null,
             null,
-            null
+            { "sType": "title-string" }
         ]
     }));
  });
@@ -92,12 +92,12 @@
                     [% issue.date_due | $KohaDates %]
                 [% ELSE %]&nbsp;[% END %]</td>
             <td>
-        [% IF  issue.returndate %]
-            [% issue.returndate | $KohaDates %]
-        [% ELSE %]
-            Checked Out
-        [% END %]
-	</td>
+                [% IF  issue.returndate %]
+                    <span title="[% issue.returndate %]">[% issue.returndate | $KohaDates %]</span>
+                [% ELSE %]
+                    <span title="Checked Out"><small>Checked Out</small></span>
+                [% END %]
+            </td>
 </tr>
 [% END %]
 </table>
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Wed Jul 17 05:59:32 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 17 Jul 2013 15:59:32 +1200
Subject: [Koha-patches] [PATCH] bug 10559: remove spurious "statement handle
	still active" warnings
Message-ID: <1374033572-11093-1-git-send-email-srdjan@catalyst.net.nz>

From: Galen Charlton <gmc at esilibrary.com>

Generating (e.g.) overdue notices can result in spurious warnings in
the cronjob logs:

$ ./misc/cronjobs/overdue_notices.pl -t -library CPL
prepare_cached(SELECT * FROM issues WHERE     itemnumber = ?) statement handle DBI::st=HASH(0x54a7828) still Active at C4/Letters.pm line 589

This patch removes the warning by making sure that the relevant statement
handle is finished after fetching its first row of results.

To test:

[1] Set up an overdue loan such that running overdue_notices.pl will
    trigger the generation of a notice.
[2] Run overdue_notices.pl -t and note the warning message.
[3] Apply the patch.
[4] Run overdue_notices.pl -t again and note that the warning message
    is no longer displayed.
[5] Check the message_queue table and verify that the overdue
    notices generated in steps 2 and 4 have the same text.

Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Letters.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/C4/Letters.pm b/C4/Letters.pm
index d36c29f..37883c6 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -550,6 +550,7 @@ sub _substitute_tables {
             $sth->execute( $ref ? @$param : $param );
 
             $values = $sth->fetchrow_hashref;
+            $sth->finish();
         }
 
         _parseletter ( $letter, $table, $values );
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Wed Jul 17 06:12:20 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 17 Jul 2013 16:12:20 +1200
Subject: [Koha-patches] [PATCH] Bug 10463 - Quote of the day feature not
	selecting random quotes
Message-ID: <1374034340-12515-1-git-send-email-srdjan@catalyst.net.nz>

From: Kyle M Hall <kyle at bywatersolutions.com>

When the Quote of the Day tool selects a new new quote, it updates the
timestamp and does not take the timezone into account.  Thus the time is
set to +4 hours (e.g. 2013-06-11 13:33:48 when the time is 2013-06-11
        09:33:48).  It then repeats the same quote every day.

To replicate:

set Administration >> System preferences >> OPAC preferences >> Features
>> QuoteOfTheDay to Enable

In Home >> Tools >> Quote Editor, add several quotes.

In the opac, refresh the home page. You should get a quote of the day at
the top.

mysql> select * from quotes;

note the timestamp of the quote selected by the tool. It will not match
the date on the machine.

If you change the date to the previous date and refresh the opac, the
tool wlill select another quote, which will not change unless forced.

Test Plan:
1) Remove all your quotes and import a fresh set
2) Enable the quote of the day and view the opac
3) Look at your quotes table and note the timestamp is incorrect
4) Repeat steps 1 and 2
5) Look at your quotes table and note the timestamp is now correct

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Koha.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index 9976995..e40efc9 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -25,8 +25,8 @@ use strict;
 
 use C4::Context;
 use C4::Branch qw(GetBranchesCount);
+use Koha::DateUtils qw(dt_from_string);
 use Memoize;
-use DateTime;
 use DateTime::Format::MySQL;
 use autouse 'Data::Dumper' => qw(Dumper);
 
@@ -1478,7 +1478,10 @@ sub GetDailyQuote {
         # update the timestamp for that quote
         $query = 'UPDATE quotes SET timestamp = ? WHERE id = ?';
         $sth = C4::Context->dbh->prepare($query);
-        $sth->execute(DateTime::Format::MySQL->format_datetime(DateTime->now), $quote->{'id'});
+        $sth->execute(
+            DateTime::Format::MySQL->format_datetime( dt_from_string() ),
+            $quote->{'id'} 
+        );
     }
     return $quote;
 }
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Thu Jul 18 01:41:25 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Thu, 18 Jul 2013 11:41:25 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] bug 10503: fix various issues
	with use of Memoize::Memcached
Message-ID: <1374104485-5364-1-git-send-email-srdjan@catalyst.net.nz>

From: Galen Charlton <gmc at esilibrary.com>

Memoize::Memcached expects to be passed a hashref of connection
parameters, which it in turn uses to initialize a Cache::Memcached
object.  However, commit 52afe06ddd started passing a Cache::Memcached
object directly, not the required hashref.  This happened to work
by coincidence, but no longer works with recent versions of
Memoize::Memcached packaged for Debian.

This patch introduces a new C4::Context function, memcached_params(), that
returns a hashref of connection parameters suitable for passing to
the Cache::Memcached constructor.  It also introduces a UNITCHECK block
to C4::Context so that memcached_params() can be used during intialization
of the module.

This patch also corrects SQLHelper so that it no longer tries to
use the deprecated (and removed) memcached_servers setting in koha-conf.xml;
it now gets the memcached connection parameters from C4::Context->memcached_params().

To test:

[1] This patch is most easily tested on Debian Wheezy, as version
    0.03-2 of the libmemoize-memcached-perl package includes the fix
    for Debian bug 614868 that causes Koha's use of Memoize::Memcached
    to break.  If you don't want to go so far as to install/upgrade to
    Wheezy, you can apply the following Debian patch to your copy
    of Memoize::Memcached to get the effect:

    http://patch-tracker.debian.org/patch/series/view/libmemoize-memcached-perl/0.03-2/universal.patch

[2] Set up your Koha Apache configuration to point to a memcached server.
[3] Restart memcached to start with a clear cache.
[4] Do the following steps:
    - Create a new bib record.  Note that it is sufficient to
      just open the editor; you don't need to save the bib.
    - Search for a patron record.
[5] Use the memcdump command-line to get a list of keys in your memcached cache.
    You should *not* see keys that contain the strings GetMarcStructure,
    getTranslatedLanguages, or _get_columns.
[6] Apply the patch, then go through step 4 again.
[7] Use memcdump again.  This time, you *should* see the keys
    mentioned in step 5.
[8] Set the SessionStorage system preference to memcached.  After logging in
    again, verify that your staff interface and OPAC sessions work without
    requiring that you log in for each and every page load.

Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Biblio.pm    |  2 +-
 C4/Context.pm   | 40 +++++++++++++++++++++++++++-------------
 C4/Languages.pm |  6 +++---
 C4/SQLHelper.pm | 13 +++----------
 4 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 7af8619..6f924bd 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -146,7 +146,7 @@ eval {
         import Memoize::Memcached qw(memoize_memcached);
 
         memoize_memcached( 'GetMarcStructure',
-                            memcached => C4::Context->memcached);
+                            memcached => C4::Context->memcached_params);
     }
 };
 
diff --git a/C4/Context.pm b/C4/Context.pm
index 7709f7e..baffc5c 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -18,7 +18,7 @@ package C4::Context;
 
 use strict;
 use warnings;
-use vars qw($VERSION $AUTOLOAD $context @context_stack $servers $memcached $ismemcached);
+use vars qw($VERSION $AUTOLOAD $context @context_stack $memcached $ismemcached);
 
 BEGIN {
 	if ($ENV{'HTTP_USER_AGENT'})	{
@@ -79,23 +79,18 @@ BEGIN {
 		}
     }  	# else there is no browser to send fatals to!
 
+    $VERSION = '3.07.00.049';
+}
+
+UNITCHECK {
     # Check if there are memcached servers set
-    $servers = $ENV{'MEMCACHED_SERVERS'};
-    if ($servers) {
+    if ($ENV{'MEMCACHED_SERVERS'}) {
         # Load required libraries and create the memcached object
         require Cache::Memcached;
-        $memcached = Cache::Memcached->new({
-        servers => [ $servers ],
-        debug   => 0,
-        compress_threshold => 10_000,
-        expire_time => 600,
-        namespace => $ENV{'MEMCACHED_NAMESPACE'} || 'koha'
-    });
+        $memcached = Cache::Memcached->new(memcached_params());
         # Verify memcached available (set a variable and test the output)
-    $ismemcached = $memcached->set('ismemcached','1');
+        $ismemcached = $memcached->set('ismemcached','1');
     }
-
-    $VERSION = '3.07.00.049';
 }
 
 use DBI;
@@ -293,6 +288,25 @@ sub memcached {
     }
 }
 
+=head2 memcached_params
+
+Return a hashref containing the memcached parameters in a
+form suitable for initializing a new C<Cache::Memcached>
+object. Caller is responsible for verifying that connection
+parameters work.
+
+=cut
+
+sub memcached_params {
+    return {
+        servers            => [ $ENV{'MEMCACHED_SERVERS'} ],
+        namespace          => $ENV{'MEMCACHED_NAMESPACE'} || 'koha',
+        debug              => 0,
+        expire_time        => 600,
+        compress_threshold => 10_000,
+    };
+}
+
 # db_scheme2dbi
 # Translates the full text name of a database into de appropiate dbi name
 # 
diff --git a/C4/Languages.pm b/C4/Languages.pm
index 3a5ee2a..ca683e4 100644
--- a/C4/Languages.pm
+++ b/C4/Languages.pm
@@ -30,9 +30,9 @@ eval {
         require Memoize::Memcached;
         import Memoize::Memcached qw(memoize_memcached);
 
-        memoize_memcached('getTranslatedLanguages', memcached => C4::Context->memcached);
-        memoize_memcached('getFrameworkLanguages' , memcached => C4::Context->memcached);
-        memoize_memcached('getAllLanguages',        memcached => C4::Context->memcached);
+        memoize_memcached('getTranslatedLanguages', memcached => C4::Context->memcached_params);
+        memoize_memcached('getFrameworkLanguages' , memcached => C4::Context->memcached_params);
+        memoize_memcached('getAllLanguages',        memcached => C4::Context->memcached_params);
     }
 };
 
diff --git a/C4/SQLHelper.pm b/C4/SQLHelper.pm
index 21f5fa1..c107370 100644
--- a/C4/SQLHelper.pm
+++ b/C4/SQLHelper.pm
@@ -28,19 +28,12 @@ require Exporter;
 use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
 
 eval {
-    my $servers = C4::Context->config('memcached_servers');
-    if ($servers) {
+    if (C4::Context->ismemcached) {
         require Memoize::Memcached;
         import Memoize::Memcached qw(memoize_memcached);
 
-        my $memcached = {
-            servers     => [$servers],
-            key_prefix  => C4::Context->config('memcached_namespace') || 'koha',
-            expire_time => 600
-        };    # cache for 10 mins
-
-        memoize_memcached( '_get_columns',   memcached => $memcached );
-        memoize_memcached( 'GetPrimaryKeys', memcached => $memcached );
+        memoize_memcached( '_get_columns',   memcached => C4::Context->memcached_params() );
+        memoize_memcached( 'GetPrimaryKeys', memcached => C4::Context->memcached_params() );
     }
 };
 
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Thu Jul 18 01:52:47 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Thu, 18 Jul 2013 11:52:47 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 10441: Testing AddShare in
	VirtualShelves.t
Message-ID: <1374105167-6710-1-git-send-email-srdjan@catalyst.net.nz>

From: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

Builds upon 10386 and 9032.
Adds a unit test for routine AddShare.

This patch also restores the inadvertently deleted DelShelf tests in bug 10499.

Test plan: Run the test. All passed?

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 t/db_dependent/VirtualShelves.t | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/t/db_dependent/VirtualShelves.t b/t/db_dependent/VirtualShelves.t
index 9f3f1b0..4a20619 100755
--- a/t/db_dependent/VirtualShelves.t
+++ b/t/db_dependent/VirtualShelves.t
@@ -5,7 +5,7 @@
 # Larger modifications by Jonathan Druart and Marcel de Rooy
 
 use Modern::Perl;
-use Test::More tests => 71;
+use Test::More tests => 83;
 use MARC::Record;
 
 use C4::Biblio qw( AddBiblio DelBiblio );
@@ -177,6 +177,43 @@ for my $i(0..9){
     }
 }
 
+#----------------------- TEST AddShare ----------------------------------------#
+
+#first count the number of shares in the table; keep in mind that AddShare may
+#delete some expired records while housekeeping
+my $sql_sharecount="select count(*) from virtualshelfshares where DATEDIFF(sharedate, NOW())>0";
+my $cnt1=$dbh->selectrow_array($sql_sharecount);
+
+#try to add a share without shelfnumber: should fail
+AddShare(0, 'abcdefghij');
+my $cnt2=$dbh->selectrow_array($sql_sharecount);
+ok($cnt1 == $cnt2, "Did not add an invalid share record");
+
+#add another share: should be okay
+#AddShare assumes that you tested if category==private (so we could actually
+#be doing something illegal here :)
+my $n=$shelves[0]->{number};
+if($n<0) {
+    ok(1, 'Skip AddShare for shelf -1');
+}
+else {
+    AddShare($n, 'abcdefghij');
+    my $cnt3=$dbh->selectrow_array($sql_sharecount);
+    ok(1+$cnt2 == $cnt3, "Added one new share record with invitekey");
+}
+
+#----------------TEST DelShelf & DelFromShelf functions------------------------#
+
+for(my $i=0; $i<10;$i++){
+    my $shelfnumber = $shelves[$i]->{number};
+    if($shelfnumber<0) {
+        ok(1, 'Skip DelShelf for shelf -1');
+        next;
+    }
+    my $status = DelShelf($shelfnumber);
+    ok(1 == $status, "deleted shelf $shelfnumber and its contents");
+}
+
 #----------------------- SOME SUBS --------------------------------------------#
 
 sub randomname {
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Thu Jul 18 02:54:00 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Thu, 18 Jul 2013 12:54:00 +1200
Subject: [Koha-patches] [PATCH] Bug 10584 - Hide OPAC biblio details if all
	items are hidden
Message-ID: <1374108840-12096-1-git-send-email-srdjan@catalyst.net.nz>

From: Mark Tompsett <mtompset at hotmail.com>

If there are items for a given biblio number, and they are all
hidden, then biblio needs to be hidden. If the biblio needs to
be hidden, this is done by setting the biblionumber to 0, which
triggers the same output as if the biblionumber does not exist.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 opac/opac-detail.pl | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 9d0851f..612831a 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -70,9 +70,20 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
-my $biblionumber = $query->param('biblionumber') || $query->param('bib');
+my $biblionumber = $query->param('biblionumber') || $query->param('bib') || 0;
 $biblionumber = int($biblionumber);
 
+my @itemsmatchingbiblionumber = GetItemsInfo($biblionumber);
+if (scalar @itemsmatchingbiblionumber >= 1) {
+    my @items2hide = GetHiddenItemnumbers(@itemsmatchingbiblionumber);
+
+    if (scalar @items2hide == scalar @itemsmatchingbiblionumber ) {
+        # biblionumber=0 effectively hides the biblio record
+        # since there is no such biblionumber.
+        $biblionumber = 0;
+    }
+}
+
 my $record       = GetMarcBiblio($biblionumber);
 if ( ! $record ) {
     print $query->redirect("/cgi-bin/koha/errors/404.pl"); # escape early
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Thu Jul 18 06:45:51 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Thu, 18 Jul 2013 16:45:51 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 10578 - Escaping CGI breaks
	results sort feature (librarian's interface)
Message-ID: <1374122751-31874-1-git-send-email-srdjan@catalyst.net.nz>

From: Janusz Kaczmarek <januszop at gmail.com>

To test  (in librarian's interface):

1. Have some biblio records to get a list when searching.
2. Make an advanced search with 'as phrase' modifier (title -- ti,phr:
or author -- au,phr: , etc.)
3. Having the result list try to change the sort order.
4. You should get no results with a message like: "No results match your
search for 'au%2Cphr: " etc.
5. Apply the patch
6. Repeat steps 2. & 3.
7. You should get the list sorted according to your choice.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 catalogue/search.pl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/catalogue/search.pl b/catalogue/search.pl
index f8dab56..e1154c3 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -148,6 +148,7 @@ use C4::Languages qw(getAllLanguages);
 use C4::Koha;
 use C4::Members qw(GetMember);
 use C4::VirtualShelves;
+use URI::Escape;
 use POSIX qw(ceil floor);
 use C4::Branch; # GetBranches
 
@@ -391,11 +392,11 @@ unless (@servers) {
 }
 # operators include boolean and proximity operators and are used
 # to evaluate multiple operands
-my @operators = $cgi->param('op');
+my @operators = map uri_unescape($_), $cgi->param('op');
 
 # indexes are query qualifiers, like 'title', 'author', etc. They
 # can be single or multiple parameters separated by comma: kw,right-Truncation 
-my @indexes = $cgi->param('idx');
+my @indexes = map uri_unescape($_), $cgi->param('idx');
 
 # if a simple index (only one)  display the index used in the top search box
 if ($indexes[0] && (!$indexes[1] || $params->{'scan'})) {
@@ -404,12 +405,11 @@ if ($indexes[0] && (!$indexes[1] || $params->{'scan'})) {
     $template->param($idx => 1);
 }
 
-
 # an operand can be a single term, a phrase, or a complete ccl query
-my @operands = $cgi->param('q');
+my @operands = map uri_unescape($_), $cgi->param('q');
 
 # limits are use to limit to results to a pre-defined category such as branch or language
-my @limits = $cgi->param('limit');
+my @limits = map uri_unescape($_), $cgi->param('limit');
 
 if($params->{'multibranchlimit'}) {
     my $multibranch = '('.join( " or ", map { "branch: $_ " } @{ GetBranchesInCategory( $params->{'multibranchlimit'} ) } ).')';
-- 
1.8.1.2

From oleonard at myacpl.org  Thu Jul 18 17:33:40 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 18 Jul 2013 11:33:40 -0400
Subject: [Koha-patches] [PATCH] Bug 7598 [Follow-up] Acquisitions JavaScript
	contains untranslatable English strings
Message-ID: <1374161620-14222-1-git-send-email-oleonard@myacpl.org>

This follow-up addresses QA comments and moves punctuation and line
breaks out of the string to be translated.
---
 koha-tmpl/intranet-tmpl/prog/en/js/acq.js          |    8 +-------
 .../prog/en/modules/admin/aqbudgets.tt             |    5 +++--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
index b1fdf58..9997768 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
@@ -35,12 +35,6 @@ function isNull(f,noalert) {
     return true;
 }
 
-
-
-
-
-
-
 //Function returns false if v is not a number (if maybenull is 0, it also returns an error if the number is 0)
 function isNum(v,maybenull) {
     var n = new Number(v.value);
@@ -822,7 +816,7 @@ if ( newBudgetParent  ) { url +=  '&parent_id=' + newBudgetParent};
     if (result == '1') {
             return MSG_BUDGET_PARENT_ALLOCATION;
     } else if (result == '2') {
-            return MSG_BUDGET_PARENT_ALLOCATION;
+            return MSG_BUDGET_PERIOD_ALLOCATION;
     } else  {
             return false;
     }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index 44106ae..82a6647 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -3,8 +3,9 @@
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
-var MSG_BUDGET_PARENT_ALLOCATION = _("- Fund amount exceeds parent allocation\n");
-var MSG_PARENT_BENEATH_BUDGET = _("- New budget-parent is beneath budget\n");
+var MSG_BUDGET_PARENT_ALLOCATION = "- " + _("Fund amount exceeds parent allocation") + "\n";
+var MSG_BUDGET_PERIOD_ALLOCATION = "- " + _("Fund amount exceeds period allocation") + "\n";
+var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") + "\n";
 //]]>
 </script>
 
-- 
1.7.9.5

From srdjan at catalyst.net.nz  Fri Jul 19 03:56:34 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Fri, 19 Jul 2013 13:56:34 +1200
Subject: [Koha-patches] [PATCH] Bug 10508 : C4::Branch.pm needs unit tests.
Message-ID: <1374198994-7750-1-git-send-email-srdjan@catalyst.net.nz>

From: Kenza Zaki <kenza.zaki at biblibre.com>

Unit tests are wrap in a transaction.

NOTE: the field "issuing" isn't used in the database

To test:
prove t/db_dependent/Branch.t
t/db_dependent/Branch.t .. ok
All tests successful.
Files=1, Tests=31,  0 wallclock secs ( 0.03 usr  0.00 sys +  0.13 cusr  0.00 csys =  0.16 CPU)
Result: PASS

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Branch.pm            |  10 --
 t/db_dependent/Branch.t | 298 ++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 291 insertions(+), 17 deletions(-)

diff --git a/C4/Branch.pm b/C4/Branch.pm
index 8b76771..c1e3587 100644
--- a/C4/Branch.pm
+++ b/C4/Branch.pm
@@ -182,7 +182,6 @@ sub GetBranchName {
     $sth = $dbh->prepare("Select branchname from branches where branchcode=?");
     $sth->execute($branchcode);
     my $branchname = $sth->fetchrow_array;
-    $sth->finish;
     return ($branchname);
 }
 
@@ -278,7 +277,6 @@ sub ModBranch {
 "insert into branchrelations (branchcode, categorycode) values(?, ?)"
           );
         $sth->execute( $branchcode, $cat );
-        $sth->finish;
     }
     foreach my $cat (@removecats) {
         my $sth =
@@ -286,7 +284,6 @@ sub ModBranch {
             "delete from branchrelations where branchcode=? and categorycode=?"
           );
         $sth->execute( $branchcode, $cat );
-        $sth->finish;
     }
 }
 
@@ -422,7 +419,6 @@ sub GetBranchesInCategory {
 	while (my $branch = $sth->fetchrow) {
 		push @branches, $branch;
 	}
-	$sth->finish();
 	return( \@branches );
 }
 
@@ -467,11 +463,9 @@ sub GetBranchInfo {
         while ( my ($cat) = $nsth->fetchrow_array ) {
             push( @cats, $cat );
         }
-        $nsth->finish;
         $data->{'categories'} = \@cats;
         push( @results, $data );
     }
-    $sth->finish;
     return \@results;
 }
 
@@ -486,7 +480,6 @@ sub DelBranch {
     my $dbh = C4::Context->dbh;
     my $sth = $dbh->prepare("delete from branches where branchcode = ?");
     $sth->execute($branchcode);
-    $sth->finish;
 }
 
 =head2 ModBranchCategoryInfo
@@ -503,13 +496,11 @@ sub ModBranchCategoryInfo {
 	# we are doing an insert
   my $sth   = $dbh->prepare("INSERT INTO branchcategories (categorycode,categoryname,codedescription,categorytype,show_in_pulldown) VALUES (?,?,?,?,?)");
         $sth->execute(uc( $data->{'categorycode'} ),$data->{'categoryname'}, $data->{'codedescription'},$data->{'categorytype'},$data->{'show_in_pulldown'} );
-	$sth->finish();		
     }
     else {
 	# modifying
         my $sth = $dbh->prepare("UPDATE branchcategories SET categoryname=?,codedescription=?,categorytype=?,show_in_pulldown=? WHERE categorycode=?");
         $sth->execute($data->{'categoryname'}, $data->{'codedescription'},$data->{'categorytype'},$data->{'show_in_pulldown'},uc( $data->{'categorycode'} ) );
-	$sth->finish();
     }
 }
 
@@ -546,7 +537,6 @@ sub DelBranchCategory {
     my $dbh = C4::Context->dbh;
     my $sth = $dbh->prepare("delete from branchcategories where categorycode = ?");
     $sth->execute($categorycode);
-    $sth->finish;
 }
 
 =head2 CheckBranchCategorycode
diff --git a/t/db_dependent/Branch.t b/t/db_dependent/Branch.t
index cc19f21..4251816 100644
--- a/t/db_dependent/Branch.t
+++ b/t/db_dependent/Branch.t
@@ -21,7 +21,7 @@ use Modern::Perl;
 use C4::Context;
 use Data::Dumper;
 
-use Test::More tests => 6;
+use Test::More ;#tests => 6;
 
 use C4::Branch;
 
@@ -30,6 +30,29 @@ BEGIN {
     use lib $FindBin::Bin;
     use_ok('C4::Branch');
 }
+can_ok(
+    'C4::Branch', qw(
+      GetBranchCategory
+      GetBranchName
+      GetBranch
+      GetBranches
+      GetBranchesLoop
+      GetBranchDetail
+      get_branchinfos_of
+      ModBranch
+      CheckBranchCategorycode
+      GetBranchInfo
+      GetCategoryTypes
+      GetBranchCategories
+      GetBranchesInCategory
+      ModBranchCategoryInfo
+      DelBranch
+      DelBranchCategory
+      CheckCategoryUnique
+      mybranch
+      GetBranchesCount)
+);
+
 
 # Start transaction
 my $dbh = C4::Context->dbh;
@@ -39,8 +62,127 @@ $dbh->{RaiseError} = 1;
 # clear the slate
 $dbh->do('DELETE FROM branchcategories');
 
-my @category_types = GetCategoryTypes();
-is_deeply(\@category_types, [ 'searchdomain', 'properties' ], 'received expected library category types');
+# Start test
+
+my $count = GetBranchesCount;
+like( $count, '/^\d+$/', "the count is a number" );
+
+#add 2 branches
+my $b1 = {
+    add            => 1,
+    branchcode     => 'BRA',
+    branchname     => 'BranchA',
+    branchaddress1 => 'adr1A',
+    branchaddress2 => 'adr2A',
+    branchaddress3 => 'adr3A',
+    branchzip      => 'zipA',
+    branchcity     => 'cityA',
+    branchstate    => 'stateA',
+    branchcountry  => 'countryA',
+    branchphone    => 'phoneA',
+    branchfax      => 'faxA',
+    branchemail    => 'emailA',
+    branchurl      => 'urlA',
+    branchip       => 'ipA',
+    branchprinter  => undef,
+    branchnotes    => 'noteA',
+    opac_info      => 'opacA'
+};
+my $b2 = {
+    branchcode     => 'BRB',
+    branchname     => 'BranchB',
+    branchaddress1 => 'adr1B',
+    branchaddress2 => 'adr2B',
+    branchaddress3 => 'adr3B',
+    branchzip      => 'zipB',
+    branchcity     => 'cityB',
+    branchstate    => 'stateB',
+    branchcountry  => 'countryB',
+    branchphone    => 'phoneB',
+    branchfax      => 'faxB',
+    branchemail    => 'emailB',
+    branchurl      => 'urlB',
+    branchip       => 'ipB',
+    branchprinter  => undef,
+    branchnotes    => 'noteB',
+    opac_info      => 'opacB',
+};
+ModBranch($b1);
+is( ModBranch($b2), undef, 'the field add is missing' );
+
+$b2->{add} = 1;
+ModBranch($b2);
+is( GetBranchesCount, $count + 2, "two branches added" );
+
+#Test DelBranch
+
+is( DelBranch( $b2->{branchcode} ), 1,          "One row affected" );
+is( GetBranchesCount,               $count + 1, "branch BRB deleted" );
+
+#Test GetBranchName
+is( GetBranchName( $b1->{branchcode} ),
+    $b1->{branchname}, "GetBranchName returns the right name" );
+
+#Test GetBranchDetail
+my $branchdetail = GetBranchDetail( $b1->{branchcode} );
+$branchdetail->{add} = 1;
+$b1->{issuing}       = undef;    # Not used in DB
+is_deeply( $branchdetail, $b1, 'branchdetail is right' );
+
+#Test Getbranches
+my $branches = GetBranches;
+is( scalar( keys %$branches ),
+    GetBranchesCount, "GetBranches returns the right number of branches" );
+
+#Test ModBranch
+
+$b1 = {
+    branchcode     => 'BRA',
+    branchname     => 'BranchA modified',
+    branchaddress1 => 'adr1A modified',
+    branchaddress2 => 'adr2A modified',
+    branchaddress3 => 'adr3A modified',
+    branchzip      => 'zipA modified',
+    branchcity     => 'cityA modified',
+    branchstate    => 'stateA modified',
+    branchcountry  => 'countryA modified',
+    branchphone    => 'phoneA modified',
+    branchfax      => 'faxA modified',
+    branchemail    => 'emailA modified',
+    branchurl      => 'urlA modified',
+    branchip       => 'ipA modified',
+    branchprinter  => undef,
+    branchnotes    => 'notesA modified',
+    opac_info      => 'opacA modified'
+};
+
+ModBranch($b1);
+is( GetBranchesCount, $count + 1,
+    "A branch has been modified, no new branch added" );
+$branchdetail = GetBranchDetail( $b1->{branchcode} );
+$b1->{issuing} = undef;
+is_deeply( $branchdetail, $b1 );
+
+#Test categories
+my $categories = GetBranchCategories;
+my $count_cat  = scalar( keys $categories );
+
+my $cat1 = {
+    add              => 1,
+    categorycode     => 'CAT1',
+    categoryname     => 'catname1',
+    codedescription  => 'catdesc1',
+    categorytype     => 'cattype1',
+    show_in_pulldown => 1
+};
+my $cat2 = {
+    add              => 1,
+    categorycode     => 'CAT2',
+    categoryname     => 'catname2',
+    categorytype     => 'catype2',
+    codedescription  => 'catdesc2',
+    show_in_pulldown => 1
+};
 
 my %new_category = (
     categorycode     => 'LIBCATCODE',
@@ -49,21 +191,163 @@ my %new_category = (
     categorytype     => 'searchdomain',
     show_in_pulldown => 1,
 );
+
 ModBranchCategoryInfo({
     add => 1,
     %new_category,
 });
 
+ModBranchCategoryInfo($cat1);
+ModBranchCategoryInfo($cat2);
+
+$categories = GetBranchCategories;
+is( scalar( keys $categories ), $count_cat + 3, "Two categories added" );
+delete $cat1->{add};
+delete $cat2->{add};
+delete %new_category->{add};
+is_deeply($categories, [ $cat1,$cat2,\%new_category ], 'retrieve all expected library categories (bug 10515)');
+
+#test GetBranchCategory
+my $cat1detail = GetBranchCategory( $cat1->{categorycode} );
+delete $cat1->{add};
+is_deeply( $cat1detail, $cat1, 'CAT1 details are right' );
 my $category = GetBranchCategory('LIBCATCODE');
 is_deeply($category, \%new_category, 'fetched newly added library category');
 
+#Test DelBranchCategory
+my $del = DelBranchCategory( $cat2->{categorycode} );
+is( $del, 1, 'One row affected' );
+
+$categories = GetBranchCategories;
+is( scalar( keys $categories ), $count_cat + 2, "Category  CAT2 deleted" );
+
+my $cat2detail = GetBranchCategory( $cat2->{categorycode} );
+is( $cat2detail, undef, 'CAT2 doesnt exist' );
+
 $category = GetBranchCategory();
 is($category, undef, 'retrieve library category only if code is supplied (bug 10515)');
 
-my $categories = GetBranchCategories();
-is_deeply($categories, [ \%new_category ], 'retrieve all expected library categories (bug 10515)');
+#Test CheckBranchCategoryCode
+my $check1 = CheckBranchCategorycode( $cat1->{categorycode} );
+my $check2 = CheckBranchCategorycode( $cat2->{categorycode} );
+like( $check1, '/^\d+$/', "CheckBranchCategorycode returns a number" );
+
+$b2->{CAT1} = 1;
+ModBranch($b2);
+is( GetBranchesCount, $count + 2, 'BRB added' );
+is(
+    CheckBranchCategorycode( $cat1->{categorycode} ),
+    $check1 + 1,
+    'BRB added to CAT1'
+);
+
+#Test GetBranchInfo
+my $b1info = GetBranchInfo( $b1->{branchcode} );
+$b1->{categories} = [];
+is_deeply( @$b1info[0], $b1, 'BRA has no categories' );
+
+my $b2info = GetBranchInfo( $b2->{branchcode} );
+my @cat    = ( $cat1->{categorycode} );
+delete $b2->{add};
+delete $b2->{CAT1};
+$b2->{issuing}    = undef;
+$b2->{categories} = \@cat;
+is_deeply( @$b2info[0], $b2, 'BRB has the category CAT1' );
+
+ModBranchCategoryInfo({add => 1,%$cat2});
+$categories = GetBranchCategories;
+is( scalar( keys $categories ), $count_cat + 3, "Two categories added" );
+$b2 = {
+    branchcode     => 'BRB',
+    branchname     => 'BranchB',
+    branchaddress1 => 'adr1B',
+    branchaddress2 => 'adr2B',
+    branchaddress3 => 'adr3B',
+    branchzip      => 'zipB',
+    branchcity     => 'cityB',
+    branchstate    => 'stateB',
+    branchcountry  => 'countryB',
+    branchphone    => 'phoneB',
+    branchfax      => 'faxB',
+    branchemail    => 'emailB',
+    branchurl      => 'urlB',
+    branchip       => 'ipB',
+    branchprinter  => undef,
+    branchnotes    => 'noteB',
+    opac_info      => 'opacB',
+    CAT1           => 1,
+    CAT2           => 1
+};
+ModBranch($b2);
+$b2info = GetBranchInfo( $b2->{branchcode} );
+is(
+    CheckBranchCategorycode( $cat2->{categorycode} ),
+    $check2 + 1,
+    'BRB added to CAT2'
+);
+push( @cat, $cat2->{categorycode} );
+delete $b2->{CAT1};
+delete $b2->{CAT2};
+$b2->{issuing}    = undef;
+$b2->{categories} = \@cat;
+is_deeply( @$b2info[0], $b2, 'BRB has the category CAT1 and CAT2' );
+
+#Test GetBranchesInCategory
+my $brCat1 = GetBranchesInCategory( $cat1->{categorycode} );
+my @b      = ( $b2->{branchcode} );
+is_deeply( $brCat1, \@b, 'CAT1 has branch BRB' );
+
+my $b3 = {
+    add            => 1,
+    branchcode     => 'BRC',
+    branchname     => 'BranchC',
+    branchaddress1 => 'adr1C',
+    branchaddress2 => 'adr2C',
+    branchaddress3 => 'adr3C',
+    branchzip      => 'zipC',
+    branchcity     => 'cityC',
+    branchstate    => 'stateC',
+    branchcountry  => 'countryC',
+    branchphone    => 'phoneC',
+    branchfax      => 'faxC',
+    branchemail    => 'emailC',
+    branchurl      => 'urlC',
+    branchip       => 'ipC',
+    branchprinter  => undef,
+    branchnotes    => 'noteC',
+    opac_info      => 'opacC',
+    CAT1           => 1,
+    CAT2           => 1
+};
+ModBranch($b3);
+$brCat1 = GetBranchesInCategory( $cat1->{categorycode} );
+push( @b, $b3->{branchcode} );
+is_deeply( $brCat1, \@b, 'CAT1 has branch BRB and BRC' );
+is(
+    CheckBranchCategorycode( $cat1->{categorycode} ),
+    $check1 + 2,
+    'BRC has been added to CAT1'
+);
+
+#Test CheckCategoryUnique
+is( CheckCategoryUnique('CAT2'),          0, 'CAT2 exists' );
+is( CheckCategoryUnique('CAT_NO_EXISTS'), 1, 'CAT_NO_EXISTS doesnt exist' );
+
+#Test GetCategoryTypes
+my @category_types = GetCategoryTypes();
+is_deeply(\@category_types, [ 'searchdomain', 'properties' ], 'received expected library category types');
 
 $categories = GetBranchCategories(undef, undef, 'LIBCATCODE');
-is_deeply($categories, [ { %new_category, selected => 1 } ], 'retrieve expected, eselected library category (bug 10515)');
+is_deeply($categories, [ {%$cat1}, {%$cat2},{ %new_category, selected => 1 } ], 'retrieve expected, eselected library category (bug 10515)');
+
+#TODO later: test mybranchine and onlymine
+# Actually we cannot mock C4::Context->userenv in unit tests
+
+#Test GetBranchesLoop
+my $loop = GetBranchesLoop;
+is( scalar(@$loop), GetBranchesCount, 'There is the right number of branches' );
+
+# End transaction
+$dbh->rollback;
 
-$dbh->rollback();
+done_testing;
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Fri Jul 19 06:06:07 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Fri, 19 Jul 2013 16:06:07 +1200
Subject: [Koha-patches] [PATCH] Bug 10511 - Odd behavior for messaging
	preferences with Talking Tech enabled
Message-ID: <1374206767-19332-1-git-send-email-srdjan@catalyst.net.nz>

From: Kyle M Hall <kyle at bywatersolutions.com>

An error in the onclick for phone notices causes the "Do not notify"
checkbox to be checked when the phone checkbox is checked. Also,
checking "Do not notify" does not uncheck the phone checkbox.

Test plan:
1) Enable TalkingTechItivaPhoneNotification
2) Browse to the new patron screen ( memberentry.pl )
3) In the patron messaging preferences check the Phone checkbox
4) Not the "do not notify" checkbox is then checked
5) Uncheck the "do not notify" checkbox, and check the Email checkbox as well
6) Now check the "do not notify" checkbox, note the Phone checkbox remains checked
7) Apply this patch
8) Repeat steps 3-6, noting the odd behavior is no longer present

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 .../intranet-tmpl/prog/en/includes/messaging-preference-form.inc     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
index ed6b067..367969d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
@@ -7,6 +7,7 @@
 				newid = Number(rowid.replace("none","")) 
           $("#sms"+newid).removeAttr("checked");
           $("#email"+newid).removeAttr("checked");
+          $("#phone"+newid).removeAttr("checked");
           $("#digest"+newid).removeAttr("checked");
           $("#rss"+newid).removeAttr("checked");
 			}
@@ -99,12 +100,12 @@
                  <input type="checkbox"
                  id="phone[% messaging_preference.message_attribute_id %]"
                  name="[% messaging_preference.message_attribute_id %]"
-                 value="phone" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
+                 value="phone" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').removeAttr('checked','');" />
               [% ELSE %]
                  <input type="checkbox"
                  id="phone[% messaging_preference.message_attribute_id %]"
                  name="[% messaging_preference.message_attribute_id %]"
-                 value="phone" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
+                 value="phone" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').removeAttr('checked','');" />
               [% END %]
           [% END %]
       </td>[% END %]
-- 
1.8.1.2


From srdjan at catalyst.net.nz  Fri Jul 19 07:06:23 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Fri, 19 Jul 2013 17:06:23 +1200
Subject: [Koha-patches] [PATCH] Bug 10452 - AllowHoldsOnDamagedItems should
	control using damaged items to fulfill holds
Message-ID: <1374210383-24450-1-git-send-email-srdjan@catalyst.net.nz>

From: Kyle M Hall <kyle at bywatersolutions.com>

AllowHoldsOnDamagedItems will stop item-specific holds from being placed
on damaged items, but does not stop Koha from using damaged items to
fill holds. This seems like incorrect behavior.

Test Plan:
1) Set 'AllowHoldsOnDamagedItems' to "Don't Allow"
2) Pick an item, set it to damaged
3) Place a bib-level hold on this item's record
4) Scan the item though the returns system
5) Koha will ask to use this item to fill the hold, click "ignore"
6) Apply this patch
7) Repeat step 4
8) Koha will not ask to use this item to fill the hold

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Reserves.pm                                     | 26 ++++++++++++++--------
 .../en/modules/admin/preferences/circulation.pref  |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 5ff12e4..b5336f7 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -421,13 +421,17 @@ sub CanItemBeReserved{
     my $dbh             = C4::Context->dbh;
     my $allowedreserves = 0;
             
-    my $controlbranch = C4::Context->preference('ReservesControlBranch');
-    my $itype         = C4::Context->preference('item-level_itypes') ? "itype" : "itemtype";
-
     # we retrieve borrowers and items informations #
-    my $item     = GetItem($itemnumber);
+    my $item = GetItem($itemnumber);
+   
+    # If an item is damaged and we don't allow holds on damaged items, we can stop right here
+    return 0 if ( $item->{damaged} && !C4::Context->preference('AllowHoldsOnDamagedItems') );
+
     my $borrower = C4::Members::GetMember('borrowernumber'=>$borrowernumber);     
     
+    my $controlbranch = C4::Context->preference('ReservesControlBranch');
+    my $itype         = C4::Context->preference('item-level_itypes') ? "itype" : "itemtype";
+
     # we retrieve user rights on this itemtype and branchcode
     my $sth = $dbh->prepare("SELECT categorycode, itemtype, branchcode, reservesallowed 
                              FROM issuingrules 
@@ -809,7 +813,8 @@ sub CheckReserves {
            items.biblioitemnumber,
            itemtypes.notforloan,
            items.notforloan AS itemnotforloan,
-           items.itemnumber
+           items.itemnumber,
+           items.damaged
            FROM   items
            LEFT JOIN biblioitems ON items.biblioitemnumber = biblioitems.biblioitemnumber
            LEFT JOIN itemtypes   ON items.itype   = itemtypes.itemtype
@@ -821,7 +826,8 @@ sub CheckReserves {
            items.biblioitemnumber,
            itemtypes.notforloan,
            items.notforloan AS itemnotforloan,
-           items.itemnumber
+           items.itemnumber,
+           items.damaged
            FROM   items
            LEFT JOIN biblioitems ON items.biblioitemnumber = biblioitems.biblioitemnumber
            LEFT JOIN itemtypes   ON biblioitems.itemtype   = itemtypes.itemtype
@@ -837,13 +843,15 @@ sub CheckReserves {
         $sth->execute($barcode);
     }
     # note: we get the itemnumber because we might have started w/ just the barcode.  Now we know for sure we have it.
-    my ( $biblio, $bibitem, $notforloan_per_itemtype, $notforloan_per_item, $itemnumber ) = $sth->fetchrow_array;
+    my ( $biblio, $bibitem, $notforloan_per_itemtype, $notforloan_per_item, $itemnumber, $damaged ) = $sth->fetchrow_array;
+
+    return if ( $damaged && !C4::Context->preference('AllowHoldsOnDamagedItems') );
 
-    return ( '' ) unless $itemnumber; # bail if we got nothing.
+    return unless $itemnumber; # bail if we got nothing.
 
     # if item is not for loan it cannot be reserved either.....
     #    execpt where items.notforloan < 0 :  This indicates the item is holdable. 
-    return ( '' ) if  ( $notforloan_per_item > 0 ) or $notforloan_per_itemtype;
+    return if  ( $notforloan_per_item > 0 ) or $notforloan_per_itemtype;
 
     # Find this item in the reserves
     my @reserves = _Findgroupreserve( $bibitem, $biblio, $itemnumber );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index c286ed1..a228efe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -344,7 +344,7 @@ Circulation:
               choices:
                   yes: Allow
                   no: "Don't allow"
-            - hold requests to be placed on damaged items.
+            - hold requests to be placed on and filled by damaged items.
         -
             - pref: AllowOnShelfHolds
               choices:
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Fri Jul 19 09:55:20 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Fri, 19 Jul 2013 19:55:20 +1200
Subject: [Koha-patches] [PATCH] Bug 10337: Unit tests is based on an
	existing database
Message-ID: <1374220520-8066-1-git-send-email-srdjan@catalyst.net.nz>

From: Jonathan Druart <jonathan.druart at biblibre.com>

This patchs adds a new unit tests file which will launched before all
others db_dependent tests.
It will drop and recreate the database with sample data.

Prerequisite:
The database 'koha_ut' have to be created with
  CREATE DATABASE $dbname CHARACTER SET utf8 COLLATE utf8_bin

http://bugs.koha-community.org/show_bug.cgi?id=10481
---
 t/db_dependent/000-init_db.t | 113 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 t/db_dependent/000-init_db.t

diff --git a/t/db_dependent/000-init_db.t b/t/db_dependent/000-init_db.t
new file mode 100644
index 0000000..16d60f6
--- /dev/null
+++ b/t/db_dependent/000-init_db.t
@@ -0,0 +1,113 @@
+use Modern::Perl;
+use Test::More tests => 34;
+
+use C4::Context;
+use t::lib::Mocks;
+
+t::lib::Mocks::mock_config('database', 'koha_ut');
+
+
+my $koha_structure_file = C4::Context->config('intranetdir') . '/installer/data/mysql/kohastructure.sql';
+my $sample_files_optional = C4::Context->config('intranetdir') . '/installer/data/mysql/en/optional/*.sql';
+my $sample_files_mandatory = C4::Context->config('intranetdir') . '/installer/data/mysql/en/mandatory/*.sql';
+my $marc21_sample_files_mandatory = C4::Context->config('intranetdir') . '/installer/data/mysql/en/marcflavour/marc21/*/*.sql';
+my $unimarc_sample_files_mandatory = C4::Context->config('intranetdir') . '/installer/data/mysql/en/marcflavour/unimarc/mandatory/*.sql';
+my $sample_only_param_tables = C4::Context->config('intranetdir') . '/installer/data/mysql/sample_only_param_tables.sql';
+my $sysprefs = C4::Context->config('intranetdir') . '/installer/data/mysql/sysprefs.sql';
+
+my $version = get_version();
+
+our $dbh = C4::Context->dbh;
+our $user = C4::Context->config('user');
+our $pass = C4::Context->config('pass');
+our $dbname = C4::Context->config("database");
+
+# TODO All unit tests launch after this one should use the same database name
+# instead of the dbname defined in the $KOHA_CONF file
+# We have to mock C4::Context->config('database') with koha_ut everywhere
+die q{The SQL database name should be 'koha_ut'}
+    if $dbname ne 'koha_ut';
+
+recreate_db( $dbname );
+# Force C4::Context to recreate a new db handler
+$dbh->disconnect;
+$dbh = C4::Context->dbh;
+initialize_data();
+update_database();
+
+
+# We can't insert unimarc AND marc21 files
+#for my $f ( glob $unimarc_sample_files_mandatory ) {
+#    execute_sqlfile( $f, "inserting $f");
+#}
+
+
+# FIXME This file crashes
+#execute_sqlfile( $sample_only_param_tables, "inserting $sample_only_param_tables" );
+
+sub recreate_db {
+    my $dbname = shift;
+    ok( $dbh->do(qq{
+        DROP DATABASE $dbname
+    }), "drop database $dbname" );
+
+    is( $dbh->do(qq{
+        CREATE DATABASE $dbname CHARACTER SET utf8 COLLATE utf8_bin
+    }), 1, "create database $dbname" );
+}
+
+sub initialize_data {
+    execute_sqlfile( $koha_structure_file, "inserting koha db structure" );
+
+    for my $f ( glob $sample_files_mandatory ) {
+        execute_sqlfile( $f, "inserting $f");
+    }
+
+
+    for my $f ( glob $sample_files_optional ) {
+        execute_sqlfile( $f, "inserting $f");
+    }
+
+    for my $f ( glob $marc21_sample_files_mandatory ) {
+        execute_sqlfile( $f, "inserting $f");
+    }
+    execute_sqlfile( $sysprefs, "inserting $sysprefs");
+
+    # set marcflavour (MARC21)
+    $dbh->do( q{
+        INSERT INTO `systempreferences` (variable,value,explanation,options,type)
+        VALUES ('marcflavour','MARC21','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice')
+    } );
+
+    # set version
+    $dbh->do( qq{
+        INSERT INTO systempreferences(variable, value, options, explanation, type)
+        VALUES ('Version', '$version', NULL, 'The Koha database version. WARNING: Do not change this value manually, it is maintained by the webinstaller', NULL)
+    } );
+}
+
+sub execute_sqlfile {
+    my ( $filepath, $msg ) = @_;
+    is( system( qq{/usr/bin/mysql -u $user -p'$pass' -D $dbname < $filepath} ), 0, $msg );
+}
+
+sub get_version {
+    do C4::Context->config('intranetdir') . '/kohaversion.pl';
+    my $version = kohaversion();
+    $version =~ s/(\d)\.(\d{2})\.(\d{2})\.(\d{3})/$1.$2$3$4/;
+    return $version;
+}
+
+sub update_database {
+    my $src_path = C4::Context->config('intranetdir');
+    my $update_db_path = $src_path . '/installer/data/mysql/updatedatabase.pl';
+
+    my $file = `cat $update_db_path`;
+    $file =~ s/exit;//;
+    eval $file;
+    if ($@) {
+        fail("updatedatabase.pl process failed: $@");
+    } else {
+        pass("updatedatabase.pl process succeeded.");
+    }
+}
-- 
1.8.1.2

From oleonard at myacpl.org  Fri Jul 19 15:11:19 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 19 Jul 2013 09:11:19 -0400
Subject: [Koha-patches] [PATCH] Bug 8821 - Receive shipment page should hide
	inactive funds like new order form
Message-ID: <1374239479-20206-1-git-send-email-oleonard@myacpl.org>

This patch adapts the fund-handling code from neworderempty.pl
in order to limit the display of funds by default to active ones,
with the option to check a box to display all funds.

This patch also adds "(inactive)" to the display of funds on this and
the neworderempty.tt template because it seemed like that was useful
information.

To test, make sure you have both active and inactive funds.
Start the process of receiving a shipment. The "fund" option
in the receive shipment form should show only active funds.
Checking the "show all" checkbox should allow you to choose
from both active and inactive funds.
---
 acqui/parcels.pl                                   |   24 +++++++++++++++-----
 .../prog/en/modules/acqui/neworderempty.tt         |    2 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcels.tt |   23 ++++++++++++++++++-
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/acqui/parcels.pl b/acqui/parcels.pl
index 37a0023..c95d77b 100755
--- a/acqui/parcels.pl
+++ b/acqui/parcels.pl
@@ -179,13 +179,25 @@ if ($count_parcels) {
     $template->param( searchresults => $loopres, count => $count_parcels );
 }
 
-my $budgets = GetBudgets();
-my @budgets_loop;
-foreach my $budget (@$budgets) {
-    next unless CanUserUseBudget($loggedinuser, $budget, $flags);
-    push @budgets_loop, $budget;
+# build budget list
+my $budget_loop = [];
+my $budgets = GetBudgetHierarchy;
+foreach my $r (@{$budgets}) {
+    next unless (CanUserUseBudget($loggedinuser, $r, $flags));
+    if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) {
+        next;
+    }
+    push @{$budget_loop}, {
+        b_id  => $r->{budget_id},
+        b_txt => $r->{budget_name},
+        b_active => $r->{budget_period_active},
+    };
 }
 
+@{$budget_loop} =
+  sort { uc( $a->{b_txt}) cmp uc( $b->{b_txt}) } @{$budget_loop};
+
+
 $template->param(
     orderby                  => $order,
     filter                   => $code,
@@ -196,7 +208,7 @@ $template->param(
     shipmentdate_today       => C4::Dates->new()->output(),
     booksellerid             => $booksellerid,
     GST                      => C4::Context->preference('gist'),
-    budgets                  => \@budgets_loop,
+    budgets                  => $budget_loop,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index bbcd4e8..10b0399 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -426,7 +426,7 @@ $(document).ready(function()
                         <option value="[% budget_loo.b_id %]" selected="selected">[% budget_loo.b_txt %]</option>
                     [% ELSE %]
                         [% IF ( budget_loo.b_active ) %]<option value="[% budget_loo.b_id %]">[% budget_loo.b_txt %]</option>
-                        [% ELSE %]<option value="[% budget_loo.b_id %]" class="b_inactive">[% budget_loo.b_txt %]</option>
+                        [% ELSE %]<option value="[% budget_loo.b_id %]" class="b_inactive">[% budget_loo.b_txt %] (inactive)</option>
                         [% END %]
                     [% END %]
                 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
index 26e4af8..5e003f1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -16,6 +16,20 @@
     var parcelst = $("#parcelst").dataTable($.extend(true, {}, dataTablesDefaults, {
         "sPaginationType": "four_button"
     } ) );
+
+    //keep a copy of all budgets before removing the inactives
+    var budgetId = $("#shipmentcost_budgetid");
+    var disabledBudgetsCopy = budgetId.html();
+    $('.b_inactive').remove();
+
+    $('#showallfunds').click(function() {
+        if ($(this).is(":checked")) {
+            budgetId.html(disabledBudgetsCopy); //Puts back all the funds
+        }
+        else {
+            $('.b_inactive').remove();
+        }
+    });
  });
  //]]>
 </script>
@@ -172,9 +186,16 @@
             <select id="shipmentcost_budgetid" name="shipmentcost_budgetid">
                 <option value="">No fund</option>
                 [% FOREACH budget IN budgets %]
-                    <option value="[% budget.budget_id %]">[% budget.budget_name %]</option>
+                    [% IF ( budget.b_active ) %]
+                        <option value="[% budget.b_id %]">[% budget.b_txt %]</option>
+                    [% ELSE %]
+                        <option value="[% budget.b_id %]" class="b_inactive">[% budget.b_txt %] (inactive)</option>
+                    [% END %]
                 [% END %]
             </select>
+            <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show all:</label>
+            <input type="checkbox" id="showallfunds" />
+
         </li>
 		</ol>
     </fieldset>
-- 
1.7.9.5

From oleonard at myacpl.org  Fri Jul 19 16:04:36 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 19 Jul 2013 10:04:36 -0400
Subject: [Koha-patches] [PATCH] Bug 2969 - Report Name should be mandatory
	for saved reports
Message-ID: <1374242676-21847-1-git-send-email-oleonard@myacpl.org>

This patch re-implements the database changes from the original patch
and adds an update for existing reports. It also reimplements the
client-side validation using the new built-in validation plugin and adds
coverage for SQL reports.

I have also added the "required" attribute to the SQL report textarea
since saving a report with no SQL triggers an error.

To test:

- Create a new guided report. Confirm that you cannot save your guided
  report without a report name.
- Create or edit a saved SQL report. Confirm that you cannot save your
  report without a name or without SQL.
- Confirm that the saved_sql table structure has been updated.
---
 installer/data/mysql/kohastructure.sql             |    2 +-
 installer/data/mysql/updatedatabase.pl             |    7 +++++++
 .../en/modules/reports/guided_reports_start.tt     |   14 +++++++-------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 8f9b30c..4ad79f2 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1841,7 +1841,7 @@ CREATE TABLE saved_sql ( -- saved sql reports
    `last_modified` datetime default NULL, -- the date this report was last edited
    `savedsql` text, -- the SQL for this report
    `last_run` datetime default NULL,
-   `report_name` varchar(255) default NULL, -- the name of this report
+   `report_name` varchar(255) NOT NULL default '', -- the name of this report
    `type` varchar(255) default NULL, -- always 1 for tabular
    `notes` text, -- the notes or description given to this report
    `cache_expiry` int NOT NULL default 300,
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index fd8421e..6ead258 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -7050,6 +7050,13 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.13.00.XXX";
+if ( CheckVersion($DBversion) ) {
+   $dbh->do("ALTER TABLE saved_sql CHANGE report_name report_name VARCHAR( 255 ) NOT NULL DEFAULT '' ");
+   print "Upgrade to $DBversion done, requiring that saved report name not be NULL. (Bug 2969: Report Name should be mandatory for saved reports)\n";
+   SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 8c34135..6bf0845 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -636,7 +636,7 @@ canned reports and writing custom SQL reports.</p>
 [% END %]
 
 [% IF ( save ) %]
-<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
+<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" class="validated">
 <input type="hidden" name="sql" value="[% sql |html %]" />
 <input type="hidden" name="type" value="[% type %]" />
 <input type="hidden" name="area" value="[% area %]" />
@@ -645,7 +645,7 @@ canned reports and writing custom SQL reports.</p>
 <fieldset class="rows">
 <legend>Save your custom report</legend>
 <ol>
-    <li><label for="reportname">Report name: </label><input type="text" id="reportname" name="reportname" /></li>
+    <li><label for="reportname" class="required">Report name: </label><input type="text" id="reportname" name="reportname" class="required" required="required" /> <span class="required">Required</span></li>
     [% PROCESS group_and_subgroup_selection %]
     <li><label for="notes">Notes:</label> <textarea name="notes" id="notes"></textarea></li>
 </ol></fieldset>
@@ -803,13 +803,13 @@ $(document).ready(function() {
     load_group_subgroups();
 });
 </script>
-<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
+<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" class="validated">
 <fieldset class="rows">
 <legend>Create report from SQL</legend>
 <ol>
-    <li><label for="reportname">Report name:</label>
-        [% IF ( reportname ) %]<input type="text" id="reportname" name="reportname" value="[% reportname %]" />
-        [% ELSE %]<input type="text" id="reportname" name="reportname" />[% END %] 
+    <li><label for="reportname" class="required">Report name:</label>
+        [% IF ( reportname ) %]<input type="text" class="required" required="required" id="reportname" name="reportname" value="[% reportname %]" />
+        [% ELSE %]<input type="text" class="required" required="required" id="reportname" name="reportname" />[% END %] <span class="required">Required</span>
     </li>
     [% PROCESS group_and_subgroup_selection %]
 
@@ -840,7 +840,7 @@ $(document).ready(function() {
 <fieldset class="rows">
 <legend>SQL:</legend>
 <div style="margin:1em;">
-<textarea  id="sql" name="sql" cols="50" rows="10">[% sql %]</textarea>
+<textarea id="sql" name="sql" class="required" required="required" cols="50" rows="10">[% sql %]</textarea> <span class="required">Required</span>
 </div>
 </fieldset>
 
-- 
1.7.9.5

From oleonard at myacpl.org  Fri Jul 19 16:13:21 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 19 Jul 2013 10:13:21 -0400
Subject: [Koha-patches] [PATCH] Bug 10576 - Untranslatable strings in
	additem.js
Message-ID: <1374243201-22244-1-git-send-email-oleonard@myacpl.org>

There are a couple of untranslatable strings in additem.js. This patch
moves the strings out of the script and into the include file which has
been created for this purpose.

To test, apply the patch and test the process for adding an item to an
existing or new basket (with AcqCreateItem set to "when placing an
order."

The add item form should be correctly labeled "Add item." After adding
an item, click to edit it again. The form should now be labeled "Update
item."
---
 .../intranet-tmpl/prog/en/includes/additem.js.inc  |    2 ++
 koha-tmpl/intranet-tmpl/prog/en/js/additem.js      |    5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/additem.js.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/additem.js.inc
index 5ab37f4..28d39e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/additem.js.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/additem.js.inc
@@ -1,5 +1,7 @@
 <script type="text/javascript">
 //<![CDATA[
+var MSG_ADDITEM_JS_ADDITEM = _("Add item");
+var MSG_ADDITEM_JS_UPDATEITEM = _("Update item");
 var MSG_ADDITEM_JS_EDIT = _("Edit");
 var MSG_ADDITEM_JS_DELETE = _("Delete");
 var MSG_ADDITEM_JS_CLEAR = _("Clear");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/additem.js b/koha-tmpl/intranet-tmpl/prog/en/js/additem.js
index 1cea437..aa19155 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/additem.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/additem.js
@@ -12,7 +12,7 @@ function addItem( node, unique_item_fields ) {
             if ( current_qty < max_qty - 1 )
                 cloneItemBlock(index, unique_item_fields);
             addItemInList(index, unique_item_fields);
-            $("#" + index).find("input[name='buttonPlus']").val("Update");
+            $("#" + index).find("input[name='buttonPlus']").val( (window.MSG_ADDITEM_JS_UPDATEITEM || "Update item") );
             $("#quantity").val(current_qty + 1).change();
         } else if ( current_qty >= max_qty ) {
             alert(window.MSG_ADDITEM_JS_CANT_RECEIVE_MORE_ITEMS
@@ -135,8 +135,7 @@ function cloneItemBlock(index, unique_item_fields) {
             });
             /* Add buttons + and Clear */
             var buttonPlus = "<fieldset class=\"action\">";
-            var buttonPlusText = _("Add item");
-                buttonPlus += '<input type="button" class="addItemControl" name="buttonPlus" style="cursor:pointer; margin:0 1em;" onclick="addItem(this,\'' + unique_item_fields + '\')" value="' + buttonPlusText + '" />';
+                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')+ '" />';
                 buttonPlus += '<a class="addItemControl cancel" name="buttonClear" style="cursor:pointer;" onclick="clearItemBlock(this)">' + (window.MSG_ADDITEM_JS_CLEAR || 'Clear') + '</a>';
                 buttonPlus += "</fieldset>";
             $(clone).append(buttonPlus);
-- 
1.7.9.5

From srdjan at catalyst.net.nz  Fri Jul 19 17:20:00 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Sat, 20 Jul 2013 03:20:00 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 10481: Unit tests for
	C4::Members::AddEnrolmentFeeIfNeeded
Message-ID: <1374247200-11434-1-git-send-email-srdjan@catalyst.net.nz>

From: Jonathan Druart <jonathan.druart at biblibre.com>

prove t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t
t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t .. ok
All tests successful.
Files=1, Tests=3,  0 wallclock secs ( 0.02 usr  0.00 sys +  0.38 cusr
0.01 csys =  0.41 CPU)
Result: PASS

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t | 56 ++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t

diff --git a/t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t b/t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t
new file mode 100644
index 0000000..46d9ec1
--- /dev/null
+++ b/t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t
@@ -0,0 +1,56 @@
+use Modern::Perl;
+use Test::More tests => 3;
+
+use C4::Context;
+use C4::Members;
+
+my $dbh = C4::Context->dbh;
+$dbh->{AutoCommit} = 0;
+$dbh->{RaiseError} = 1;
+
+my $enrolmentfee_K = 5;
+my $enrolmentfee_J = 10;
+my $enrolmentfee_YA = 20;
+
+$dbh->do(q{
+    UPDATE categories
+    SET enrolmentfee=?
+    WHERE categorycode=?
+}, {}, $enrolmentfee_K, 'K' );
+
+$dbh->do(q{
+    UPDATE categories
+    SET enrolmentfee=?
+    WHERE categorycode=?
+}, {}, $enrolmentfee_J, 'J' );
+
+$dbh->do(q{
+    UPDATE categories
+    SET enrolmentfee=?
+    WHERE categorycode=?
+}, {}, $enrolmentfee_YA, 'YA' );
+
+my %borrower_data = (
+    firstname =>  'my firstname',
+    surname => 'my surname',
+    categorycode => 'K',
+    branchcode => 'CPL',
+);
+
+my $borrowernumber = C4::Members::AddMember( %borrower_data );
+$borrower_data{borrowernumber} = $borrowernumber;
+
+my ( $total ) = C4::Members::GetMemberAccountRecords( $borrowernumber );
+is( $total, $enrolmentfee_K, "New kid pay $enrolmentfee_K" );
+
+$borrower_data{categorycode} = 'J';
+C4::Members::ModMember( %borrower_data );
+( $total ) = C4::Members::GetMemberAccountRecords( $borrowernumber );
+is( $total, $enrolmentfee_K + $enrolmentfee_J, "Kid growing and become a juvenile, he should pay " . ( $enrolmentfee_K + $enrolmentfee_J ) );
+
+# Check with calling directly AddEnrolmentFeeIfNeeded
+C4::Members::AddEnrolmentFeeIfNeeded( 'YA', $borrowernumber );
+( $total ) = C4::Members::GetMemberAccountRecords( $borrowernumber );
+is( $total, $enrolmentfee_K + $enrolmentfee_J + $enrolmentfee_YA, "Juvenile growing and become an young adult, he should pay " . ( $enrolmentfee_K + $enrolmentfee_J + $enrolmentfee_YA ) );
+
+$dbh->rollback;
-- 
1.8.1.2

From oleonard at myacpl.org  Fri Jul 19 17:38:41 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 19 Jul 2013 11:38:41 -0400
Subject: [Koha-patches] [PATCH] Bug 10615 - Move saved reports action items
	into dropdown menu
Message-ID: <1374248322-23294-1-git-send-email-oleonard@myacpl.org>

This patch moves saved reports "action" links (view, edit, run, etc)
into a dropdown menu triggered by clicking the name of the report.

To test you must have saved reports. View the saved reports page and
click the name of a saved report. This should trigger a menu. All
options in the menu should work correctly.
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |    2 +-
 .../en/modules/reports/guided_reports_start.tt     |   44 +++++++++++---------
 .../prog/img/glyphicons-halflings-white-koha.png   |  Bin 0 -> 23022 bytes
 3 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/glyphicons-halflings-white-koha.png

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 0fa93ab..7d64272 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -2423,7 +2423,7 @@ a.btn:visited{
     list-style: none outside none;
 }
 [class^="icon-"],[class*=" icon-"]{background-image:url("../../img/glyphicons-halflings-koha.png");}
-.icon-white,.nav-tabs>.active>a>[class^="icon-"],.nav-tabs>.active>a>[class*=" icon-"],.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"]{background-image:url("../../img/glyphicons-halflings-white.png");}
+.icon-white,.nav-tabs>.active>a>[class^="icon-"],.nav-tabs>.active>a>[class*=" icon-"],.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"]{background-image:url("../../img/glyphicons-halflings-white-koha.png");}
 a.disabled {
     color : #999999;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 8c34135..fa1e8bc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -287,18 +287,36 @@ canned reports and writing custom SQL reports.</p>
                     <th>Public</th>
                     [% IF (usecache) %] <th>Cache expiry (seconds)</th> [% END %]
                     <th>Saved results</th>
-                    <th>Saved SQL</th>
-                    <th>&nbsp;</th>
-                    [% IF ( CAN_user_reports_create_reports ) %]
-                        <th>&nbsp;</th>
-                    [% END %]
                 </tr>
             </thead>
             <tbody>
                 [% FOREACH savedreport IN savedreports %]
                     [% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]
                         <td>[% savedreport.id %]</td>
-                        <td>[% savedreport.report_name %]</td>
+                        <td>
+                            <div class="dropdown">
+                                <a class="dropdown-toggle" id="reportactions" role="button" data-toggle="dropdown" href="#">
+                                    [% IF ( savedreport.report_name ) %]
+                                        [% savedreport.report_name %]
+                                    [% ELSE %]
+                                        [ no name ]
+                                    [% END %]
+                                    <b class="caret"></b>
+                                </a>
+                                <ul class="dropdown-menu" role="menu" aria-labelledby="reportactions">
+                                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Show%20SQL"><i class="icon-search"></i> Show</a></li>
+                                    [% IF ( CAN_user_reports_create_reports ) %]
+                                        <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Edit%20SQL"><i class="icon-pencil"></i> Edit</a></li>
+                                        <li><a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% savedreport.savedsql |uri %]&amp;reportname=[% savedreport.report_name |uri %]&amp;notes=[% savedreport.notes |uri %]"><i class="icon-copy"></i> Duplicate</a></li>
+                                    [% END %]
+                                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Run%20this%20report"><i class="icon-play"></i> Run</a></li>
+                                    <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id %]"><i class="icon-time"></i> Schedule</a></li>
+                                    [% IF ( CAN_user_reports_create_reports ) %]
+                                        <li><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Delete%20Saved"><i class="icon-remove"></i> Delete</a></li>
+                                    [% END %]
+                                </ul>
+                            </div>
+                        </td>
                         <td>[% savedreport.type %]</td>
                         <td>[% savedreport.groupname %]</td>
                         <td>[% savedreport.subgroupname %]</td>
@@ -313,20 +331,6 @@ canned reports and writing custom SQL reports.</p>
                         [% IF (usecache) %] <td>[% savedreport.cache_expiry %]</td> [% END %]
                         <td>[% IF ( savedreport.date_run ) %]<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=retrieve%20results&amp;id=[% savedreport.id %]">[% savedreport.date_run %]</a>[% END %]
                         </td>
-                        <td>
-                            <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Show%20SQL">Show</a>
-                            [% IF ( CAN_user_reports_create_reports ) %]
-                                <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Edit%20SQL">Edit</a>
-                                <a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% savedreport.savedsql |uri %]&amp;reportname=[% savedreport.report_name |uri %]&amp;notes=[% savedreport.notes |uri %]">Duplicate</a>
-                            [% END %]
-                        </td>
-                        <td>
-                            <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Run%20this%20report">Run</a>
-                            <a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id %]">Schedule</a>
-                        </td>
-                        [% IF ( CAN_user_reports_create_reports ) %]
-                            <td><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Delete%20Saved">Delete</a></td>
-                        [% END %]
                     </tr>
                 [% END %]
             </tbody>
diff --git a/koha-tmpl/intranet-tmpl/prog/img/glyphicons-halflings-white-koha.png b/koha-tmpl/intranet-tmpl/prog/img/glyphicons-halflings-white-koha.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4255ba70fcaa47e34f34e143dd17e957e0f3d2f
GIT binary patch
literal 23022
zcmd43c{r4R7&kf#hOvz7`<i{<Q<fP*CNg%}w`7Y at 6k_cAnmuKYv4o-!Wvf(V8xkS1
zhiuuG^YwerdCwo`T-Uj-^T&Blf0Q1kYvy_G?|px^yExnp9cm;S5(0rx>t4HR1c5+D
zz}HRWWZ?J4QvXlj50cv$eGCLr+oMDpzYPA)dQZ#Zp0T&fy#NQ_TM&%1x8p4y-8&Aq
zZyDWkaDM3X`IZU<auct66=U*X-0}GAOub8(g|x(;;TJ41F|i~}8mSGX-Pzs!^1QTE
zW$yRyh}-c71!^aYi;K6zH=!`{M6bz~e{1S#kkTwmn$_jyw5L}Bye3}XnfTW66CL;P
zl}q23EB>ovugVPyPEYqYf2-35E%fF-EYXEtfkgG=<hV0jz7?pSab<B~JX6P9J?T*B
zABhYq$XIyc%jm3mR81cu>_Y-`fAsUTv$`!7LG74(2WRS;bU%p%V@)^1T`8;AdW>@)
zfByUlW6=(fLqn#%@{nq<L>KREnfOK67U?X%cpC^WYIyr2pvvpEf(k}ByhM-ggTB)t
z#pg5KpSFuXs~UHk*(&ybiBZJ!vN`2{BWsSNy6sb*F_oTElTGvY1dnb?vFJhV(suT+
zUYXt;=0lXivjZ*2yOHXPD%^g_`kK7~+|<GDgb!zSO`o>aHUHiC$;S5XP!s(roizSv
ziM~2Sw at YyCLe|M5#jz at iQz!79=cB&Bha<BnpDd#+%Rl4a4+&hGjA(J3svN#eCAy)Z
zK~h&&*UU3oE%fwQ38&9`O+p~~Iu={mEqHozw0D-DpYNO`7iM`;Mn*=22fSwLF#^S9
zO+oj4WTX)ukGORCawQ(QH#avYDr+TVy5C8roQQVU)rZW?%pe3VUTpV)vYBmcY)F$d
zYL}Ik+HZE*ySa%FN=p3Z{!YK&`tadHiirM2Ha50K9?R?3#n`Ty8eWMQ_!6wDstR at N
zzDD}+;lrrMg8D0VFP%Sod8)o08?!LaVRPUA4c^>$S3~KdC)e);xz2lOJnZi8|NA^X
z9$8*py{ccB8mOyFq5BYGvWfo!rDb<!lD;v5=^B^zGX=lU?%-pYh=_!OYVq+sJ3TRx
z2u<xnC^i{zUAk*8AU`>wrK4l)sYbqkbQIAAHHmf*`;MRKqA-F}1-$6EYy?@s|9l(p
zw<IhK+Nv at zIvPTfIE=z#vBxZ$4HvUe-Ib)|Jabc`pLUjqg+h;Z*SG`wDCyvz!-%+7
zA4B&yW|Zs&9$XkZv`H-}DA4i}oA1q)lfndkudxbfsI0`I1Z{0>B-C$z%Qxjwwzm%z
z`rg-$J)|j`Qn~h`sHg~3Kf|l<FKph1Wth=kQ&ph*_2+x-8NT=E at ZTSG%LX)NA)+&K
zd||jaAky>OLf?~e`!3=-VV1tUJDBgldCw%yt<m_cM%$w!#V^+`5FS#IaH$6F(Ep%H
z&0SguC*n$u!*X?Mwh%6-;NNpIde;%yQFv^L!_g*8d62|)d{MKcAvMkm;Zk{k_q%%G
zqE5<`=rv9>q=?5pGS1+c%0n984 at k#|ZnQ5EdC5K{fYVjHrJ_Q(wYa#G!9}qddbrTX
zewQ>X|5qwKmpBGD>w?oJGtC<lHJd|bngrnkzoi-x!ikR`yV-a3L_)4{5?B%02XZdG
zIeOIF%Z7x`1?>&f%1es|WKBj|&!%~!4cyD(`&B%1vKU2$Ya1IIKRh0E;~5hc3~;Ax
zKE^0zvz;I7_aP^TLa8CRPZZ{)h;;a-ly%cao*AQvz(YueS?ceXjg9wV<Pn#>q<ygL
zdv$>jZfYY0E!skCRQIu9UzjpU_j9u-q#uhg at 2_<JPkI*oknH2(a)VGKOTuiW#h{pp
z(b|vqp=W|dqNb^VMw6&7iJY9As*wwQn5_Y_46f#d_d$E>e|Og=q{5NrxEAPOJJYcb
zjw8)O?RAqjw{DRc<-M<25}GaLmrWK;Fn$|__u+NnDDx;}<$e#V41AfF2tLn6n&#sU
zCZ>!m^#(<5`8<-B at aB9SZ=SF at v^$#d*uKgH)AhT at Ljvzs&dQPv<M~M>W<<5_!ZN-I
z`}~>dis}Ddf?0vU2HYh?s3N6z{8jb(2k4hOgM?=(tQ$15HPXDSE_+`fk8p~)NYBC&
zijs+wG7N~z6m-<BIEyuQXQ|q5llI>kPvGjcfAwATUB=ejx6e;6+ at ULhbZoe~3oZ!>
zTx4NM_Hj)7N`9rRq0pw%yVLIb%(s-dyWb;xza12H2o-t2Br9HhF}cmxXR`NFxk@~x
z|3Y9+W at Bl~hgUqN`>uaau77&Tvwoq-Jr)(7{p2dz8W*D|A~_w}#5ptVc=ls<yC3$x
zaaWlxr#M9suNq;ZN&emP&y$Z=7A370O;XgRjwXJT9 at 3-b*{21|W+Np+1;4A=7rr1{
zCcULM7tffX{P$<`Hs{5FouxtcjHUxn-L==RUvEPvu-dDd;i_1>$>Pp$X3r+PLP1MU
z>ScYsOv2EHU7bCKUvWFEt^O7<)-LDZO2B$Pe0&|YdeB$+{GiG54^b91#xfQ~jmjK(
ze{~Bnk}q0^*$dCHL1dUzj0L`1@~fVsK^14K*CA6Z=TR>Y3hzV^C8yV?-=8r$lfAR$
zsNQ<M at bhA$s3}g9vsou_d8iCk*hJzm$0dG^`h}s9yICa!+TAJL4tZ$G)eIRssvI2{
zxC?Pi1D!h#y?q%yTgd1kt#EjF=w29^_Vj66p2 at cN&!$b6sn&;^&z?P_Py3k%=UZJ}
z%_usK<52*;o>Eug47A>Dd~Ou=ccjzU7Z3aVz7qM?Teoh(9ai`LPM^^;Fp$*7(qFhx
z|6Dt`vp2xc?>bo{o|=kk2vfyGa8Rpg-`d<<{vg|W#%}SDxxBpGfbYBK*cV$UG|cK!
z2G#h;`z0}YicP{DwKB*Uq$({d>shqe8vHkB>mSHi#WCguXWd9m&qBCs&Ql&`U-LKM
z?zAHhuPA)wcHTBNHWs>k=@PCn817GYLs(e&67;L=z!II=2~IiM<NFKF+bqt7H8pDj
zbsY+S2TOEReSLlNTUuI<(Z}RBsd4L9D)R5#xpRW?*n^P#TJSW2kc0`ht`%~&M=UG1
z;NMCP$gEhYNV6DmP=7J)-hdI at rcm!XP0}E4!AuLn-c-+XjK;AaV=ns2e71Q;^4K=z
zxn#8ElYtKwSLTO5AdM4qhQ5{&rH<${EH>3MVb8)0S|$?uyFWvD8&Arg$J{v<IXTiY
z__sW{hka+Myx6t>+^fIz<8Y{BqVZwBXRx at yOtEApi}jy6M)$zAawh+klf?liaj~Qz
z{zEG<V^vaGo4`s32M0zK6%~uU!e`2U3voF)IUBWh??d2}`y+GXgOihO)GRXw_-Dh2
z*ViI3j=jCTc4I$&cw4tVkl_^&5Qxjp&X!SB^q&WhxBy0Z?9`o?G^+W5qR?G1{HI3c
z5vJy at y<h><GgA%{Wc`avtkH70hcz-TF3xARJB~8Ur60<as&nbmB}q^}a#!T#<>QCi
zyre<>H%GNokt>~z)>tv*ax*gCN3n2;U+sR(TX#DcH8x={@TMF&{x(+3&iGY1R!o{<
zkI*@!wq^U!z5FDKl36fJI}QDWF>P<6YxS6%ghv6iF`Z<NqQC>qp5yD;k^+!z#vcpt
zpulX4n>W9r=V at G1glKEy<Km#VVPihQb%V00;~jasVKa~6RFB`Z%j(cCWy`uA`#%D+
z`?7fN5)=Z9z0fB3u_~um6CKt at v@<d?`V~%N;bXhCwKWv;IWsd;`Rrg at hs1Tqz#gVd
zv+`w_r|tuQCzcorb_?O-A8kQz3^g=58I3IC)I*MO{Mr)I8s2Hf1im-pVYwx277&xZ
zCrY(z+l&1*L}3#&WbCm)+ufOP9_cWNt2DQ9`*rp8S}RLS$CMNlx$<MZLXH2h?w2{q
zw=pii=*lk!5A=QL5c+}CSbwgq48<OyYghq18WA&p;YqsorPypdX5Ps at il3_5+`Oxo
z^an+?fo53d7c1<Rgvfk9nDmKs^z^k<SzFY~9G;$@FZJ~G|7mGyDWiuK+ov{|?Mr^K
z)yWn_b9l`?H=NsvNYU4QfIlv-u2z9Bo$j at Nd?e5~MC*DLG7Z%#+?bu6b%c at gFzsYr
zlAvRht{3dGL;^solQs_y(e98_FK5n1WteIMN<H*67?$|<%EcD$j32LM2B2uGwKjcy
zeN<T718N1z%vZPjy<kjS+)ti72`!94Rg~Xd|EYZ1;i^_MG>?8_AQ2REm at gWb!Z?=G
zN-CbeYbdwIKkr0!C5$-RVSP&LaayYTSPjB{=A4V7MA$dksrawv2v)R`jox{WSADP4
z{_R^E1-+nku^Ag*w7%Qr$`>zQAfmfa_G35+YEv__h2x{W6zXghdir50T54J}|H>i7
zfIo!iU&MIseTKyFB9d!sgybnBIr%RIgIjm*Lhul_J_$fI63r at 0GFJfYFoA)-D$ho8
zel6VaoO;}cpdm@%+yC=I=Kp6GW~xmbvh`B_dmkO=oCtpj0szQ`)jT;`eF-_j{XRxs
zh&vVjg(%EMVQ=&Ir%)cnMmF-cwzikjZ at kCq9Ms9X_UCNx>Iql7a;h;)T0b!8BV(xP
zMNHn+T>2uD%I4n0J?COs%00IM&82?%d#v86-+sZE|9#P0ZWlG-M^i2L|FFwHN{jTF
zw{y2SA%piEP_W{=W3WFckRG_4h*=f}RL|xWq$~Vdvt`=PD)uxt=U0RC7zhvku31G-
zK;+QSZ=x)>nJdq9AM)*OS`xHxhFP$fS#=IV?(fD-*CLwbqg}J_yo%*TI`>>%y?s0z
zb%y*USJu-Q8qOAMg)}&H`&}J*A>_HJN{C3Dx5k38Z-J;P08~eAhK41~iG>O44%Ci2
zZ*@dO641-sCULXA>J{l_E?q%Q&;ix9jP5&LUS3eD5_8|NIoF#67zr(ZU~#9v_Yz<+
ze=jL36O8x``Qc;t)rrz)0EtbTn3!C`D7Bt<))7D at 48poIGctN%FjyyAsdKv7Z}Dwq
zr6_Z=Kcw%tsIah|#?c!PO_?P<69a>O3)-`e2!uK#BO}2#?b4yC4N;ojd>=CD$;85P
z&1ZjLJa}M!k&lnBx5?`zWYP~n-Y4&ii;Kl0RD<!Phm`;fcJvuszn&0bBckOM{M%2x
z<zO!VgcAF>`zIf)?Qxc~x;S8(3bL|WOvJ>f_PTe4RaG9 at d3kKtl7b<Ut9Z!0G^M2}
z!<>C^22UZwqs)?$lK%ETeT~>o+dob}<=08}e6%_H0iN2Fk&zJ&df%I;PoE;o=2295
zHaIv)lp{o96N at VZP##nN(y0?{<pEFq@$qrV^(^sRdUp0FSg)VO!-ZIeEUv+MVHxh`
zL~SMZi)6IuOF<P&_#rNVBFW1F3lY)g_DZeHjEqqc>&%h4C;<BHl{z0^VSvX6Ye?L~
zT3R)%5 at wOyw1wLH_Hx`~OP3IxL}_lO-FDapv!nu#aw^--6ry=O=JTLvu)S|PY+tQx
zGwEwEuAltL!Q8G%edCw<`P;t7kQO+-vVM4XWmVNYVbZuvONw35v(2S1 at Av%tyyC!w
zqx~rz1VFb6nT#ZrtI1PcCE5oOUTU$=6g<qh8bwX+ZDW%1GsVnzZ2%2WsN>y=NpB)G
zEp7 at ->+x+^2bE&K9&gG*7PiFwPw9%w$Oi-A*c~yGyLXp=mW|i=MIT1PFX&tOWpI#$
z2dH#y_q=^eb%4bwM|x+p6SICJI$w>=qix$C8%dUYV^OP)qJ1V8<XWSDvMMkr*|eh2
z&0%N~$IaV4bREeO{OY&?%wz5Srs=QhKHN^hiH^TC6J-{@bfB~ejcC6uWA?3gTn0W*
zr6^2Mp(zz~+DSj`&+=c%AD%kLUMa3v$TyGG5Fxu!!m>~M*vL|O>ZwV$agk2cNMfCr
zk3&t{l|{M$O|AX1rMD0NzA{=-v0~V(vkE&|R2q2$;cL+-Yj7-^hsA)34_{144T3B!
zoWor(<~7Yc$TL_|CtCnZ5~tN>;uq at TfzK(+I76)LHP$vTH2m03#E)RyU-GfpV`@2W
z0F(_KPk~Tkr at 2_~L!$|mTa-!7V^{JDE_T^(4`j+{;x0u at 2D`&N*M(A<5vB&2TnUBX
zOos2&Skya`@!scAAX0JTq*zAb(f=~if<6-~cFbxl6-YDQxtbEdxbug3-h*AOwQXyO
z=Gd-R*hpm$?QwUtIX~2`WqNwy&r5Z5zfx_3WBk5QBMRq at di@|GUm0 at mO*kENOInmF
zb$Cc)<t9UWw2T9!8xd!mUNP8(Xx`F(QTLe|Kuk<qNqBfTL(Tz@;<ZG&?KC!7)g~f-
zu18;If2beyR&OIVweFRO8gjuAa43$&X$3z9yVl;t{WC#aFFRbHeEWVbPxaB^JxYz0
z=lV}vFnt@)&uc%M{Uj1mj>d0?;EJN`J-XYaIVl`UJZgjmr|UucX0YKFBOnU2m;^Q`
z0?cw`Hz+2*(@Rsu!maWE?OTf)yYl|3=ksYGDhMD&O=$pMxvC^D&(JO^;2zbV$SNn;
z^^;PZO3;{1ZLE`9^@fNHw`!t;=9eYSzPac8p6dw4y26>0moH^+V<%BVniU<S;K219
zpcAIVUmoeW8!*Z{!tw%aTkb8dkB*K~fOG!i(F&39iKl+zjdv(X^dOaQpY}8QkMrt4
zTS1+L2UgSpXc!X;*gz;Liz2tH;Vysf*@Y}MpiyLNQE&UykUZBZLxK at yj^(S}g4aBA
zWSRQ~D3uTc14BMw8|Z{<W)a<jKoEf5q&7*O8E^FXq^n?OZf;JQd;a-D+o_DG9F-Im
zcacbBCu(qDczBpkX=os<wDh9b02gk54=!e2$D&+CKiIVhV7>&H6I+nasv*ZsQ9~OY
zOs7kDy6wTR;$p{(!ft%^gl8d#M at M33Cr58yR#pAsEn7z{r)6ggi3Wqm6_A(yjHRKl
z(?UOGHKfq0hepie2f7#gtAp%Z^9lsGHx9hx#UEp1wl-~nrmI6`*I$BfT!6Y%6`*}y
z4hz<C>_fknWK{5)aK%JMI!Bn%X?`v8SX*18e;<4RoB9^8z0g+*28m5c_wlb^zdVD2
zg7#@>0h6goVplS1u%XR9!k~3 at bbc=lmi+nm at 84VW{7SCe?NK9lM8&u8%(J?~glEf)
zJopWoY$MCA;i__^B?;uuWY}&5?;bhYbL<oh at ZbcBI;dw14L(qDsf`0m!^^`US;#fK
z`s3C2G<NN=PDBIWg-9T4vNX>`d=0j^p2oItCUgPUby7D7wTwdf9+nb==cHlOBhX>H
zEAMvH(-%$Lpfo_mVgIwion=d{C(#VaxE<CuNLrV<u_Trx@{h77*uD$yrB*kz4z1~Y
zZe{_n!kFuwb3%O4b&AR2A$RdTS8hADvWt(>hm1+d3mpsz;SkpxhKFi&Zl_D?TR2g|
zLO2ZrI$#kzgZJ%o7*8yUw@{}@LvJ4^8*sg9qg<y9>#?Uvsgf71UacYU at r3{3jZ7wp
zi6N~Op_6C?LwhKL>Tq<M2ZxqmXh<*19eL&Q<v?LK9ACM<v)ZA%y)Tof!*D|Wf`fd;
zZ+IsFbg>eHyeJu?KRhr;It4JJ0-4%1E)qX}6#Pmgn%J3`Wc>b=!hJUV?$Ocw?1zN!
z$sEeENd*O=3a;eQ41O31VK7M<0-j#JzmnJ7+^iV;Xlw3sm5Ymuu;#n=&NX!<B_(<Z
zS(RpoNU2~+yLZ8B14Ww7Q7E--p#IQU9%Bsm9~<+e(`!rbP5k(Ai<O<-SmNXtlADW*
z%YPt at 3UuC6pTnKygp54Y_zM}QkBNa+RudMF9zBw9b91w`o-tUTK{X&laZV8bOQdR$
zEtIsBY?{?6?hg;6#xlbsm-TE3L?DzLGQ5Dmc5<pxhj)i%{tTq$_KziR-o)FY9IxDk
zT{Jf~E&<q4eC%VXPm-yzhxJn?h$V{znM+H;r)17yfSYTj2WsEv<mOJ-y?QnMMA`v%
zlQI at xQ=T7sc3RJy0A0HTcdE5|Bl+lax`1HMmY$y8dots(0omXs2eq~?gavd^B^d7(
z&zyt$fnRt(|La%N4Z;C90SN_{d}bBxoz{Cm56wJ1KH%5V-y4>t5fu}Y*<w*dyT2<A
zU at N}QdO083%qUuPck%acE7UFSVwa!AwG#Nj$3g}n<h1A#iSlzW&cah(ei^CVA<RPq
zAsJYD^uGj^|GyvuVPdA9Z!oJ9Z~iJaig(;ri+vt#Q%D)>4UCH<GbNjW!z at k~NEB&H
z^SQC1N~9Z&re@!zZ^?PWHuL_`(XJoS{|MCOZT<-;);!~*h{$qmmQq_H(?dW?2ACiu
zwAg5p$$OZDc*cT*va&MU#r}d&EWzfD_w*@Qiy_%PbMDt3gaPkx?&?g at 9@JPb+2L1r
z;WC1Gt?dc4Iq2_HTXuy5*V2ufb4RzbC2d;R{WIArVCByzFy=U@*q;QRS7FO5`~u%S
z?@YX2<LKd_RkaW`HL49MF&EIUC4&k}QC}T1c30yKF#Z#N!}$t<wKj5<WAz_ at J>UVq
z-Vjv+cb2X!Jx>7Qy280E!y^Nl9wYA7;@n&*me6%K7gZ`KY4uuMK~&UTQNW*2QGxI4
z?e9-P7;TOb at h_IbCP~y;pcUpZA$=TFJv}|8aDo%@8c$PawB;$pX6Rd27o3Y!MoH;=
zQFJbfTa9EAc7fdK3=l!iv4|aaSJx#lG8;-=R2mu^Z7v7y2w#akA95q at ot`qyE}WO{
z77~Yt{ZO%Fn+1T}22s*lzYAs!_8=2i?euB}1L)QE?(Qz{2$yB<6^@Rhy}z|dEkO_N
zBPj?)4Z-}o&v|k0;N(2o&N?<tcV{Ai^#8G}0sPc^P2CUJ#Dn%{7_|yVQo(%hxiKxz
z_Vl1yK2<(1a4f7I1qZj*eYR<Rut_bwdiApm^Szr2+}zxTUPr(l2n`7diC-A+f2MjA
z|M>A^421lmfWXac at td+jii(PvmbnO~Z|xs*+?}20B#i#n3Xnm>R{JX}D^-C0{HFKI
zm&+K!TL&+)e}Q3Ms>Jc}L)s?==QtT4U3VRKtsC*prT$cSQslRUr$S&Bhgmw at Sc16)
z{?MvaEwv5Se{sO`sC!IH_fp4@=*y=>q=&VOVc>TOky~=goJu)I=s*l-2N+>o<mBXc
zyUUn(@UiPtMzSi`s}C}$NFPh at C@e*XIvj>EE`k at Hb0$iKm~ymcdEJaLEo8TJ9p}`8
zP`paITJsvte!U#yY45b6&=`}3Zaa)Xpr*oT21D!%W$`~qTdec5B-||f?$63)=XJf`
zv8+YMady)@Nv1h-q&XXs4IwBTU-!&uAFaZ%2};?$JBB}o*UUplZ~k at g&_QoOpd?(U
zZ9cz0vQtx2UkD~MmSxbZJ|MCoxhm0?mX@^NrQvmV{}yGb0{KvN^H)cND$i>G0I%P@
zTNecww5&p}nTbhtFn}fR0sgwN4<4!w0)e0hjrjsD46>@vSz;Cy)~kMhg~;aq5iTBq
ze=c5_osbgFOBMaKPDJ7anzy~TwI$1T?JSImGcYi4sGGXZR#3pDeMQC|u}D*`@o#VM
zJw;xiiJ6)0!O2m;Ml2H=0y at Qj^=%`gAq`8@>e3wbbTKoa{JB{6AA~PV0brt1)713f
zLM*7%<4c7(GOjsUYztNv77t*3LHtru+~6>DQM^Pszpkuw7s8EavH9cKxajEUkkQf6
z$?bX-hz2>foOX8L<Z&4je14;f)nOg3nOBd4hwK%&$D|K805Iw-;!*=`_j!wYDtko_
ze<X2-UdE+ERCULV(jAJyU?j19kP)YIJ?!`F?B(H!39&zmivjenvtoeAc)_G2d<@)r
zox&pXoss4-i0gwa4n&%}TCCuQ7c<hw*HdN)=SHk`qkAShK*kZ>6*DOS^(@Tz%59}m
zC`8MLsRo1rzit?mvN~DZo$-cco<`YUY5Y1bB6?MT9-w8pQ|)sQHy$OR8WT!bcCq|{
zshSxsQaPraV1$0rDU at aVz9FUXoAHTCk5?+Y{d$rAKL2<1xdl61KSRSXgaHL$?sDfX
zW;7(tWb;31pW52757B6eW)v0iAADs*+NbsU_3InxXOB5VGeya(Z at zNj?K$D0ax at l$
za{?z>O;|7Wjda*5dK~#!XD!|l^iL~{qmuX3v0e>w8K6 at 2!U=mO>JM1PhXoR`s+I%|
zNCmHAhM1{kGdIbXFJJQ0hDF=NOr4bmD!brSp*=F(@&Y8{6Cqu_Zv+3W=vezhNoXlw
zF08Mw-$5h);3QmCScxZ5mAsU+PVdUg7q8;XIps<8;%pi?)JV-}Znf80K}xwx%gXK>
zdMsrONK-UMM at K|N{9d1GqkJX?iff at TI=9d)9}I?0Ak(7GfjJ{d!1_;J6GOw9;lV-Z
zfj6DPD!h>?Dk_S;udh$Fh@!w9;oS4(OZc1NVBk~s;y7L;#l`7jT#Q?`@<zL!Xg*?j
zAdEWeM4Ov`x3xTovv at TyiI&_40RHTIt=(C>=~=3ii<#M|sPnt5EGBNrMhNt(NlN+<
zmuUUM<6%vK#zu`B*GXN}Dwu(5frD6GKo(<yEmAVsRHX-YnXO~gQzzU>%xKPH?`TC3
z(|;qzu-5in<i86eL0Q^H=Nhb2Tn8elbxi*x5Q(2^CN;!)_U9}6QHdy^PBsumff=Ra
z5o)C|Y8lb at Af$a}XEY1Xrj}OhW_3)L7}YWoxn{9{4-O7)0<m<aCnt+vcnJ(D3-W)$
zm|$#BMN_YVo}M*%UJ6-mZFxEKwG=MV9!cMz3c1_g#No2H+sz`wUF|<yhL1Vjg8Z`(
zx$`+pl*9T+7u??A&v#VK{&x{FiKX!zB3)D9mhZQ}eH&q`%0Wl>l6K7K_}q<QTM&|y
zliP>Vw%ZP4b2vnJ#KpyFpImY++ssq&P*e-vuge{3fL>0<nVM$Oe*|6RGHIzWTNH%z
zu&|<{3Ff~Kmk7*QN>JHIx{GEmNvtsa*F~Dhb&BW2`JKrs0DZEawsJpp%!G7l!Q9kT
zwfWxiP at wM`-|J4^@4*A9Qod2~@}(p%EZ(-XOc~_~;~jXCzjC*>wjSYEdM<By1L`yE
znj4$Ut!@iCpDn#b8P(-Th~OR=Oqx9*eC0zQnctrq4EWu(XwE=1MULVf%fspSp;2jl
z&p+0&)xCf#VE2aH$7t`}MM^*FwQg`Vlv2Cz<Ky#zr?DOR07v7UoR=~kY)NxgJfYP;
zV;86|H6RuOg}E|Zps4U6ZwE?e1FTzo3vHRGLC1BT1ffL%CErJ$93VfIn|NY;`WGuQ
z9q{!icyQW(jXBSM=0CZ%f&>C{Z7}*@aUpgI%Xp8HVhO!C$P<Bg`jo87P91d)TF;f+
z9`HtEU*No_-<_<1#&*`zc8i1+?==T8#h%NusA7?}BKYJgFcRK}0xsY^kR-*UsL+Ri
zj@|m{xA^T&Nr1`#$g?2Ph%QZ33^(b;@IfaexC4cp5c2j()}Ih^7^aRcp&lJrD06zx
zUN3k_MNg6><E|L$A(xB5AD_3IuWTYzJ~r9%HS%91uL at upo%L;nr~9SLI`a35s|Bf)
z{JL1y5SHtwW|9*tpj|i@<!9xjNo{EU%jwdX at o|{zQ*I|ec9|hhhTtDuMo15d at s;%|
z)~5J?f4@@VMW+Kw_fFsal8>xw9Z}hzZxiu&=Gw#BG#}2s{vy7_>@3uwwIg`wu`%Sr
zh-Mr3H~~CwS?_rZOFNzLeV6Ik(*Xs)F#)vGu#eNH*OIOXI55)mSleq at Kw6AZZFmHs
zNFI%0gul#v>%Z25PC`;xX~O+O#e})CB&?nX&VR{d=Ba0ubFsiVs#SE<1H7D27et0}
zEDX9zm_JqU80A1rT2a2d4M>|G`pw^VQ4Q>Gh*e3VB`czB1MSs=8 at 9$_!o4ILSNT2$
z`-++7sH01+H{>8Y{rd$KDDPQLY9X(G?}-vul)?Vg?>Rm^41~H*mSZXX>PN(gRQ%Qp
z#&2hmtWSUWUO_`HWXfP5CiVUS0ZMRqGu|2jr5rb?i$|Fhg4sC1z|4$j7d1;&5y({N
zwZ`!#i_sez`E*4;8ibZ<zAWUD>fylg!w+8C at WhguJ}-O#nE|rQgH#rR(n8 at Al>1$v
zPUnPo!j#kS$m_mzms$?mH@?Gd<WVmX%^IXoTo*o_gj$x_8PTgk%kJNysvu^%lc;;$
zkKo2EvtVpV=+v%8Q}+&H866~jc at xC7-MkZ150)GoUM5(onlv<A8;NJUZiz_hQ7toL
zBhA(7S%W|;t~fD39C*k>dftzhf0o*cO4WurE~3PZk;PUd$#)GmUk`4@^X9cpK45xh
z%kuI4)KSM4Wy6<v8OfK=jPfMd&ASefZJUHR-)~QNkNuNwVwJ^{jFm4r at 9aYRxuIWw
zMI;Q?`b(Khzc33Scc|pIW36})qy-6ayGrtos8hxKwW#ox`{8Yt%#R~_(Qd+)Nf#=&
zwj=$LW$8|XDzK05cu<8tn3Ze%vaq}JnaZpt`(5CTzc9+)w~Ym`SmBh2Xbz033HC2T
zRG%LZG`HnmUW!G%isA4(4}PGW6{}<7rRdupZZDt&+8pL)+ at 0&(hMz|e*|@G6 at YHRT
zHyA~2V!WbqDOV=>h1vlmc!2Fim{!z1qpIdBmG}AmCALXcNWpTMDC`+0lWpnmAcnh}
zYtRSAer%GZ>dPW)!fe8AUomROzH<LEtiIo-X$6s--xHLJhQMn_Qu6i}tR)btPTbBa
z=g%M#)SN^M1$NI&n42Nof{p%u<tvtf0+kaNR-B)YirZtVRsMSrkD3lz4Va0tE-~-Z
zBWfr9<*Gc84y$3 at V#bxVS9}ln#`!Ua(@b{Nca`E4!^`wpdH7#Vqt)a^vu=sTsUk{A
z6NTNaCC3Tl-p2Z0(mRnX)Fag+e_~dSQk&3KJ91YLP0UViNmc*2o%H1J*p7IXn(apb
ziugvY{QVnhtfdu2FSvVrussbDb)sMr$}1|K77}^OZ#=bx%d4|?D at se#LL3p!0L$(L
zJa&?-GvCp?b}g1telF*H<P})j&+BBV1Mm2OLH;G5vwlFg>OUvM$IBXvbpm}*Fk%+U
za0;d at Nz8i!Vfo5jQxQqEb+hc#goHn1krec5=t-}`gY88v0HvGj>+2_kWsU%z83tKC
z{-^2b>D`|{e}3@$W0KOj=zz%MWTB^j43k&SG?4=xHiv|SGR%i3Jv-Z+obHLd8{LBn
z?p)MM%F?W%4QSNcb9u2*j!)5#aO*n&a8E!O?Dp`NU=0YvZhN$yQkQT$Yd<ii-MChl
zW6d5yEfmXvrf8m%dfCNg;SKTH8Q=|i=c$UfZ{NNd<V(i5M69A|gi_hjo_I*Oc}35J
zOU0ySRM^Uj`$PK=hb&f<^X*~qHyE+L9+?1OAO&Gu0O>q{7nw0%lW5lb4p{8*xe!FP
z^NgiTLiyfFJ5xU^uKz;A7BkZ+(N*_%IwI<d=lWwd;I_<QszNY6)E*K>Y}$3a%+~%!
zP8A3jLE*`WA at xS9v%>wWN}x8whA0$Y)x{aUDo4t)k8RlMtP6j-`-jl^Mc+Mn_kxp}
z at Eyaq<?&w3ZQ33cxu<T8Wn^~8Kv!>iZfatZ at 9E_9>dwK|yiFln_PDAEi|d^`kH}Y(
zvch_Gm_k8rW^ZlcjSy_ at 5S`rI&ScNqqX%+MAp>=?FW{nuH6Jv5S0Rd*)WFlJ_i%H|
zbo{dxevI~NY7IT(Qn^TNrB6}4Px<ZXm28^CT2_ETilu#WE at S(2xVHdpxBk1dRG}fU
zJuyCR3+rlO8<W09%gp><k8p&65NApLJs1=VwfG4AY*=r48J=-EI4r`5yzjYS^g+^9
ztt|Io=@%evX8|D1N2sb2V;vh4Cy7#3_!?g{t{Ij2q{p#tP!QXN_#uAp3dSvAJOuN`
zLmF;zh-hY2u8H`f;O<R;=Eg|@U_zdF9?XG1nxIkuR+j|Q-rHNY`VE3D8<>mViiy at c
zwveR(sAmm at Z(o75gNDEhF41cokLG1W>_5aaTE)3_gb~w}e_l7<c3TVaR5h~{*G7AZ
zL=1`e<`tJUFV%Qrx0!jjMb-%6On(~RyxGIQzGc`vDB~Pdxzxr8o)7Py_GYd at 4VQr8
zTVVy}hgCehdTxh0f9r?buT#I+2mS%mfS?yCDXBj$=?LUo#ek_O1|(?T7_*uism-94
zCHxk8XA%K|C)rKD4FV6hxfBAS?Pl9n_9<7+6;SRa6b-I_2|PwSN!!*3)MJ`YKlb;(
z&kLWL+W}cOild{WPhY=&rHojh#LN~pU$i&yoB<ls=Vu16mf8*A26#?QP2K4Ez0;$L
zvHyF2dZfzy^U5u|rn^wjciGv@`n`x|Zk8B%IqtSk$kJJiUp0?fW>AIjGDFTyw1i#s
z&d!dc`xDAl8|iZvGecLBbx at cV3y$=so{+SRjEg~6Z}sIVuzOFnHpj-qECS8^6T&@O
z*)xQLx!^p}7=r}rXwGnD3{oy3Z^3DsvO=Zoc{AV&&(O78V!oCL{}*cK0#l~tLPYQE
zuU{7A)z|lZk`_RL|L%;Uybt1u>07|1c!mC;1VS at X!%i#+`M+eVGY7stK6l8dnT-am
z+ql(3T*C!Fu(Gm-%E-yRhaN6-4J2PTS-M3D9NvF_zDq@&3#DP*cn5#VhNYOFMII~_
z)zv0PrzdYY2PRdPe9`K`P_x+>d|QMS|41+>gHmjkC}b3?EeS!_;OyT~kt(V&506{B
zk41SgRq#@L?U$}UJq=0kMJ(`3+u(4ioqc_6?D9!n(#T(shIlTkOZ*9j!@<^$V?(S8
ztHsgHJ7k5IAkQZffuKB9>|erevJ3edtYA&e271u_Y*Ou49{~{MhbMAXs3Wyug(D1t
zysx0=uzKknN<YjLRaPDOFY(|2gyNFyjQ=xta2|?~w<IM0&mhA8!V8gxg!3BR1 at WON
z^+$(0N=wg~2Ta|0WZZ9(%ThWEO7wBBtm`Op&t(_Qg|HMZtntBFPc<bT(J(_=mf#H9
zO)q>(wa1Uu^}g9(eLww}$sa%K09x>(wz1&(=e|qQa&rcZmFc at SaU|(~*48r1$_{uG
zN)}N1+k<Q2x!3jO(k4+YUZ?|6HTM{h9xv#|-Wn)4p=^n!^XC+3?259 at 6cxUKNrGF(
zi~!6r?zSw1i#h~}- at BHRz+Y%CqC0J<;CI-JTMbEN at tp+P_T77cV|z!gvyl*Zzhidf
zxtr at WTu_XAUF$1BAQk)uyrS-E%#=IXzmE&wo=#}Hg-17YGYGa{ZRJr{SEmH_j>RQI
z{@|rMr+_>r8;c#M1wAZ;Jsr&ytr4ZhrI0IAbE-Vp_=c-C0U2OXe)rN)M^P2`BZ`dd
zv_3>;86}grD at R<WXoV+y-T-HT?<83WvDnAY*(a&vA#+b<kZ at jFt^O?IIVKTtX4Oaw
z3K65Rv9artX<e>wFV^O0U34o>=YvxgZw2IxoMpS64yLbAm{B<$9e7)s{@qajAgtzC
z+BhX$yCCz?v&La<^;qU+flUEzCnu#~8S#f at kd@(C?zA~<tEzFm1~-?_&Cznf`ZG7C
zSWu*_i#tumk1v at 2--TdLid#vWqQR2RBDV at mLt!vxI%|nav8(Xvo2?sSMtf6sj){av
z{qdu2QV;Hu=D#Vv@$1Usi?zvpA;U)}dilQ;mABL1C*E{I1r at +>0c0Xn5oiWg(^{rh
zt at g}M8?YhM-JufVBZAZhraMdVMp0TM2|OZk`atgShw0ju3wvDM{0M2^Z+70}J*QPN
zP6bKXj;eV9KU?L><41f?Qtu0_l?kNXJQ}<DBt!Fa5w!bh{K at pe`#T38S(N1O-0D{j
z2(#c#DZ!5(dem8F3Z!dQiMk|vzdA+nR+oHvA~Y?&wg)w2xx5leR?}<%%Mu`1rjwa^
zi_FV(3hdWc#)mQz#dd4&xlEln)>p3 at W0ht;1-++#b}zc-<l at oo6$T5MIYV91 at o%@E
z-2KI^TcJiu%hKU)KgUI-N7JSQ(9je0(#s$`v6N%E;KVKpi!%gi3Q{GH(dzq!wuovN
zaI79uh}VfIaFf{r6mt9D%7{YG_G1v-v1&4QRC^60VbJDD)KBKvi|Ay|AYfRCY%#f{
zj$Pdt_a16);FqgaVBn(1_L{E?cQnB%5i at Z`p;N549lF}i;t-`~)mNcdG3qfDQAtQT
zcXia|!v=&TL|i?@`0F=dO)nak-%x#ShN82(#Hs8%r>4-$n<Gt_vvq%B5Px(&dQ)Sh
zDOizT_De6H52$;<!G0VRFNr#z67AR*%`GjKT=I#CO5EV0Jdn~Jk+YJRRa?|EI-`6e
z at NDZs@^qNwgE2bho;4o5q)2LC^_Oo`f72_!b4Up7p$N at U+i|#p<F9ONRCoqF|H%~F
zBECIHj{>&|?o5b!pwy_WVF;rC(B5OUqZ_?7m#1Gb80JlrmosC_*R{YbeR>;rc`l*V
zg50Fus7gc2n}tW|oyamYr2z|k+xGL2kzJg`z5mSo*)A6~Np##nA&kNd!WVH)CoBxo
zjrRC!wYy(mvzLxR)yy(yEaMqn;ht(N%{Y>OW|%fz+<r+)c<M?B?m-vO)cqEgW-}sD
zJ&Et$sd<mxy%HOpq>bwe9%$uxfy|`a#*iv(F?66!D~T2It|L!K6r$^?Cp%_~0V>V4
zegzb=ZMxU*U_?KXvV$M5ZkNb^L%T6%WC;@>gf=8I=YTuo=G_Vt%si8881HL&lK6mB
zj%rWfZ7?n6_fr6PA>>H)-hXY}M|L4&$x%&6NXW^;V(gy3|L!AgZS5np at 8Y+oep`Ec
z1vKd;(MRXeO8mm)-28k^Y+_<Qq?Fa|g4+4k1`nIX#;);1aLx~D#h09OIqDC$<|qo|
z5v~S`(w_O4`*6J*8XB|Zz%1GTnUCZMV%p<EhxIqFUOj08kmg?;y^v%uP)I~m^Ai*G
z#=d4tp`gEK1<PjOvY`MZ(6wvSi>s)#vW<D%A=QrpX31$&@WGZRwl4+1ALu4<WKToa
zLE;;X5JPIujW&|FuvNkD!S)tJc+hnvkj|=9ke9z&_d!k;@=-~5;kOLpnU~jja2g=F
z8t`gcHI~J0pu_)s>+ at UN*q)`i<SX<;z at vk$vTW;DNl8f`XgDw5yM1!_?<t66?%lk3
z)4>=QR at gKJ){%61To-0%#}SEtx#xCx!rUrEK_FM4q7|A;p||~nz^Yb=ymIkkX+D!f
z%CnHvVd at tRTGT-m6!`g5LTPEK8cr3447GR!bEHHfWuf!4_ at wlkJTiC)jDH}QMn=LW
zl`YlMi1VuVb{aD!&#RdDqnNw{X$YGD#0*(Gz?@TU^=4gIV1e%~_dN^P;fh@<OJgSj
z?7#S3?O<vSL$bT)r8MMFPHC1AgK6;+-{2At!W*A&HY^cd<0zcJgP=xAS7!oK8 at qch
zg(ZZ1MVIdh^=w49h|C^vPTl};c&Co)>sfeTwy~IaMKhAw3YEiD6}x=lO#>Mvvm_C!
zXdBw0onyZqBVh~s+*hD(hbRTcQL5Z6=(})cMF#B`CFnpmw^Lkzy39hv at g<AN6ze*;
zTrj-XdLT;>OUVerEDBiz?0Q71Q1>S(&(uJQ+?SN*%MQ;rNC1Ve;%OZIP-liS%Om1c
zT2Zsc?t-t8j9Jes+DN1Fs_r`AN2_9EG|P|^T0;P-!jarLN0`;*<YcZf`3u)1fLzM6
z{A6%s<lpH3b0mNiN})JCI;!}!yE}4aq3fsj?c3S6JU#W~_M9jSfE;aeC3s)DueZGM
z2v}18MFBFR)!`ujaP1CUP;y`(Nc9>(;)L4f<^u$yEMN2yMpFui at dtX;d%uy~sRu;8
zg0Y_lNjq>j2&`x0S=#~u!8Lca8Gx(_!>RW=qw8W|kdGa<T3R1+L0b4GSP}U{vMHkQ
z>eZ`l@)z=2-|kAO*#lpYN>5XSC=bN8r%}Pd!IVJEeMj$xb!6`nMvF|~=f|n+bK9X*
z1t`G6$xsULph~H*Sqbz4%JtwAfI*34mOyFC1E+=2#o77zLvQbK^wXy&T*9x6x_kf_
z^4 at lUD7qP}tE{;08&AEAzUAwwYH9=-czSUHQ?sL4B2O~THBaf;T at 7tH>#~;`Nb3p*
zmV_CQ#YV(ba4AotqUMpRY}XnRCpsYK(ryE_ED%b2V8lw3b1+Jpb1v-GhOqztLD>Dj
z(~|}0@#`j}Hm<5{bpMC+Y!BYDw5aKT)|bMnif3w%4%zP|d^|^~5#7R#u3gd8N0{=%
zX^^O$0DE2A_Ol>nMinS98e;i?&Kc3;ImT#3tiWLcDzVqD^-%vKxw|@6f4fjR%%=5*
z1O(|p`#kflgB#gZ<F9(wZV}JkxZ&5oaU?F2<b=|+ON;oH;ME}hpHFZt2T`L3u7z84
zVD-v`p)MTB4*6_owDF(%wNzPlp7N`GI}VzWGA&s>#_>FD>Aqj~=8ZWMkrutz4|vS9
zA^#wVt!=}4@*6$A8=XkI;@}XI!46RY+Mv<un-2jjaAtaWaNbDIRz|9(iLI3M47+vG
z1z_oty|K%+Gm^rL*s8XoPJtgipmjzFhoIeZEL3~UdoI9mjTh}s`~jxjmQM6iS8Fyz
zbJqd+t){SQA{A97)Of68pu?lq_!EKcZ;<D1(}?;ZL(3?JhI9;q$^ZVsmsGGJz`$hn
z+EW?w_RocbA)8c|YsqX;Ocfu<<j<6t-h=`-eb&!?4BGO5-TB+cB=++5z*`x+JLou?
zQIBpikUk!R4kdg&1|3NSVroKMstNDKN1 at 2^lIqX>rC7!wv at F<6(Lf9gThg=4XjOI%
zYkOpHnS}@ty%Zj)>0Ztr+{TOrQLDf-%KPr6ypHVpC at z(K?LRvP$wzK?)LtO(7mAwU
zA&z1H#Ltt&4&gxLI-8uDvL$mgH#76s#bRHEkMSt*Gy?sKFh^DOFeqpOE<)>K(cn7h
zB`7Euos+|2ZvRJ=^`-=W?srGLEdRhAF)%e}&h3 at 6zd$r92chNn4<0;d!mrnrHVA$0
z>!Vh*)6?r^zBUi(J4Lb4NQ#Ke at V(*N+TMN}$AMUC9~v?;GBMc^OeN4XEXoiTB7Vkv
zJqBqfZs7doN=ix9Vv`SgfRPs<Cmejf^2gbo{rK^3k~nBC84=r1_@@OdVOC^OfQ1R<
za^}qb{yq!FZ3j?(12Egl28YF{j)5dNY`;PQWp8Vq>q&bY<M0q;X0|I>CybMllnl`$
zG#7 at C3=SHSe)RYCH4 at NH=I{f-lxHY$Ic5;fh{f^i;ctzh>|16omafl#&E7)<9hNIV
zqQD6KGlJ)A49S^Bf1fw3GK?0x!}Aqbqb%ovU3%X>8n)!9&mGYoX at Ls0y7#GEuff{>
zomZ0xPom_F^$k*T4#0Y7d{Hbc?aW|g8tsD6V*Jo32bK8Emlw%@v=#EM0_VT2#Q6rx
zSVRcwkAB2bz~8A8EfljoM;qB7Pa{z=6j%nkKt^Z<k%*o)$(&r^{WtPZ{pR2MRx!w~
z?XO;@%4Yed7~{qkDWsQE2g#5u0O#K0$IDyug|;f<H8+6H2^BBE&$cu)5Iv;-nQTTu
z8v|Jjk&KVJsk+PMLokP7Nv#EAfl^DV?5UTrfm(GJ1aQY4vz*bNsY^ibo)i)^3cEE}
z+%axUnyI`r6GmxVl32KVk6Qf2<`2YmV+b^|aW<0CWGRZ79FWZglmZ`(c^NkDlfx;5
zS}Ne)y&Z^^xN0G(dCvmSFOEf(T_P69Fqwjf1N^d(*9^Ke>|-#=)F)P!mPY7R5CQkM
zAdNNIWbBIW(<QW0<eq_Npk8=jG9d6_E+>TwWZRCRrQBmpVa$pM8V<-Sj4!bgN3hu#
z@^D4oQ&tqVk+g2QE8`o5Oq@{WQFeuAmm=>snN*I=W?F7iVy8h4gS2P(1`pm=5kD8^
z9w$k}Y|01iuHNtAgxS|#hI~IH@$GUwx6|X|h at _NES7}DE_kp4tllt9~_R5($i>Rqa
z*TGVf0suW8ouhJ=zz-s$)n-O8!saefS){JQ$V53JM2Qk0CLb2p<%$i`EliXF8o_5U
zmJjiL!(d^whvyT>y8R7R2a=eRMP%4&2a{J}v#wFEDj3 at j>POEriQ%%pyJAr90gzi-
z2dU4+_FjMzMg3CQXt_&cOt!;Fdkmbn&oyl5_{(=R#@CYp&iX1{C=E3m-<VQ~rKS|Z
zny3BF3++}k*L5e0{CAOjFvA6Bk5ahMtnm~G+?9-CX8WCU=e;3gG-?(sY1W%oEImwM
zV-&0CyjuI;>L~N7sk!-A`ac1_UF11xSaL04;a2pmZhJuDz2J&${{Vj7jA01E&lCGP
zaD?!!i}hY)1X6OaLiAhu+*5E=#f?zb-J9i0<ZQb7twZE;!wTE`nd?k$CA0FT>=YvC
zyJ(isP$%felS$0r1|f$ag?FE3vUyPRFELG)^>L!v8F~I|&-7L+NKeM284TShd)gDD
z%hFOZ-TB*uM*nTU=lY3{FFWyVZ59U}e6i0`QWUk*HvFtxmO&X!A*eU=RPk_M(47UU
zx8~75Yg(=jtDbhO455aZ441?d1Y8tZE5Q6?E$kd^em$7^Nr+D1J3jNWo?;&Ky;23;
z2ejR&BJtbKeKE+|eKLE(Tyf&*r=G!0W^`t3<h at PPo^iX0UYNAEq%u`Fn&q87im3nh
z*T+cC>$5kTAe0I+k}dKM=BUA`;*&f*O{!8-w_>p{AGAw;DA#^S#or at kvx&qJjiQ>&
zQ&JNTRtXhth`Inz#t_Re(MTnvf6%hv^+`2<w$h(;)TDBNDb~jMtT{UoDvx)RJbUp+
z?U;~j^e02{54CZ(!0|jYf4lxvD90x^mS|mP{&t<ox6Wr!F6aGte<35!nP<b#3w)N6
znFt^6rP2Q#9rvr=NvGtQrds!3r^7LR(#w}iyqJv6VblC5fPVAhk1C0Yj9!t<?{Kf$
zu%FMv_h2hhWUU|Lh_CNF$-wA5|N8Q0GP3e2Vd_Zd8%Ix at JmgSE-}Ii00 at uo#F~sE?
z4?=@Bx_HsQv(u at Ux`_pGciCvV+xwbvqLE-)rV$M47JB{Q*<&xx1dEj9*WO<VqZ|{X
z0tFdELdBO9FV8-B{Vu1(hcEtxOl))j`f&3BBP+L|UG`R0=%0gZBQqbhw0|tj4{Bvc
zgY1kwjQJmL)`p&L+Mh6QrCpNspL|%(rMx!9L<q!VcftmL{eXWE0vy+4=iV-r^qnB|
zh+pfSj<k3dajAk}fdrVx-)HaNhLYruDzhjvFKa}~oq6LLTeq$VEFN=ao^faqnh#wX
zJ?YVRBk%APr0WI;?wVj~0tfOPf`X1n2I?+&mI;tYjPan1^L)^mu<A}*U`YAk{{HDn
z<KIi`DzB-Lc$S_>v*H64Bit`6;@~-@`oN7&;N6hG^Na at LF5!D){w-muip^^*=gH{!
zl at ifi*`+Qlsa!^DVTX2*Q4cLe)aVt`&k;oG*Uv-)%gC%UNZ7|U*Q0PoOLSM1uH7g@
zy6f at pnbqspq)z;bX2dofCmJLV9ix*p4PtLLX}JBy<37lPO at M?BOTzk(SBrci3lT%o
z%KRY>UhTA$=R1kYX^)QgWr*LtNqz<YbHV>LfQ)DCkq-$u9RY+=y(j6Cvs#_TQ{;H^
z%G%n~q*)%>-HLEg6Z;R4ysy at f@h)<)YP5V^agc7Ap6~|P at 06#Zp&<aI_YIyGL at _5c
z at N5c%5uTRG2dBo=hs}7A%ja>jajA#-Kl27Y&Nb>#d at qWIM$O*UwW7}R$4gQBGSw5%
znvUmkQ0 at Y^Z{4cl`@}i?T%Ypmw{N!k$+o!PE`!Bd31OMrq+ru20_>q$oCnmfNXBA0
zs@$N8IMPB5dw at 4LCnqN-u5s4H#mBc?@mtUvINf61AL1p<^Ywl$BtTK96fCfb+-}^s
zQODyttyE`zaxR0ewX4V`Igr4DC(!7iiw-^%Vn210tSk=TdV3UwC)qtmSchO<-Xd0_
z=o7+I1lmKyKIkY8+D`Kw1Ef#{md*8ilNsabyG2(9;5bWtQYf7AejmV2NO;#evz**E
zJJ2hF3bB!S6etVm9n!(}_ at C@IgTb7?h;qUQ{wR!U%P at 28Zt%h!keK;I9FtHLys@^n
zW)`954ulQtvf4XT0IvHsKV2J9F|!4nl$TkX#*Rv^@-UW#Cz!*cgiFC;5(ml+!VH5@
z<>kjjSXi$H^G{*H=MFkvWyqKC9ItAS+#}F<+P at 6z2KO!m`ZeZBJ9byNW_wx~Uurrh
zAN#HR{-KZ%3a{;GzZ})`(t*2dUPOSJ1q($(s41`Z`FWfZq;-7$%=CX^z0djQ)QLFH
zzoeNH(ue;?7>1S%DE5H`=NpaxgP))U&PDzIRviBqU2uim)1+PU=NXW|loZMQ7vd%b
z(PfScEu=Fbe(!82t?v!-73!UAxGPsN0M;lnNptn9!kPU)i3tDHF&26R75)hVOXC=M
zVLRM}r at LK9G8L1Qt;!L=pMNpSWdE%><gxdtJx^uXCM=%<kWZz&jmhqfV7ql5-Wv|y
z at uit#wqS#0vPLKy46e9q-GjU(V+eeBq~zZ6l;u6Zme!6SP4XyGrPcX!x}>G)68h+S
zhp0cc7dDv>`y$?x1Wjd8pp&k~N7?XEcS`St&sCU)Mf5@^S0UA{Qm5q|GgUo%{X?>v
z;k_hL>W!2Vsksf}X!H!Ug^@%X6 at _KA%IAZpa)>`lHzuSzs?|&yh;3u2Z(;jF!CqcL
z0<)BwI><^V0eIl43UHAPSkGjKjBj)K$H*@Q_H1qWvitU8B&8^zzU&80k`_9jh+mv~
z%tefbRWw52VEVWJWUP`VhYxbE80^>`N}R;vD~xyb(m!9ijHJ=X8q)QAPQ&S5q_)IJ
zQGCZYiY%F&OKQ=lS>;vhUP5K%cuizy%&U5O4-)_BJ*TW&|64O>{tji^#_?Iqj0UA_
zBVtm>Hg*q529?H^y-AiqW#6?hsTr~)9=j~blx>I_p;Tz>p(jgZ31vx^$TE^_?=`*8
z^BnJ=@Xn9sxbI`!*L`32d4A8&_xoz#u*u1=wTWjRMqMUyTt2>^A`T^Hj5Q{S6r at u9
zt9ZwmHvAa7xhuHvc!@VF_WhT`rZ(jwIJJnO at 7084F4hyc9bqj9M)|3j&+F1&q$}@q
zruS#a{n3KqlI!T{QI!|G%Q-qkIWzs>7te9S&8}Y7YL3>@O at W(Ph5OJl4*d?@iqXy(
zt;K%di9)eZiLLI$2ocPRo&D1R16e}ygzfg&N<u!RZczH#af?H_MUcuIo!#Mh-pDg~
ztrbO!XyR$+=q)%Wk2J}6{&eXiEH<q?P`45DbdaVrcR1U-ye9K4Zl%AbGur3l at jBtA
zOkSwaxZ_dfeOR0HM6*VXyj{%3=&9I3^vP-B4Q#;KtLnjhpKWX|r_Sin^X>Xq2_?7(
zr(`<<t at xWqN1NYEm1NrrP2d(%WDhj>KU#qqy3<K8!3<I!++mu#8_HE&`Ez(&JWly*
zp~phl;!Dr439|MkSC&WYz(RXs>A8GeZJFX<i(v!dPpWdmRXUz3+zE5P{yb$@WI~xo
zR$W`egr=i3;px-0mxo$B7Q>Rit~Z#TRuRsM{qpOYiKcez=#kj;XY}b)=&V0gcSIFB
zbI>mc0^7cuoi5*{`tE{u)FU-5?V|JrO=VApq$cSO8!z9s$iO7-?BT>TH8-D2><eFT
z^>%m1YCpIg6LV`UnNLs<*|wVOilY~e&&+tloQePKz?%OK_|Q&rNQiI}p9f$A>k2{4
z1Jb+ZI%rRC%68pDOqYq1B$q*cO>QaT64>dWZk&@Fyx&J&J-4&4P at V;LIBBr!``{ZF
zfp(=gS$z|f_b3Gg1xYV2uSWp2e$~Qc(s~;j^mmW!0Uk8zqjCO`TOiM=M$r+d?B4>!
z*?wMx;1Sg3*4DgU;H3RwF$^Z72JnqKLqkJ$O3Ea~Jdk_igae!QOZ=-7jSUUnG9D(g
zb92VMy}fF%3EqOG<jl--0wN->l822ynwpq2l;4iPxg%Q)%c7&BwZ2&f(1)x8|3Wz!
z?T$-H!FLUVKqG<ZA#0=I*PvaTND$Zcg_Z-Pz?maXL=K3i_fYt|*R5u6I5><zczNVW
zx<IC0hE=Yq31_6gr8w(S*-*5pk1RYAQ0JlAD!MW<#rsac<@}T7bVwJ|4ZejH(KdqG
z0{lR6qu}eiFb<~o=NOeS_X;Ur%#=^_G-5dz#$#-2g2)MD0--!JE6ed#x%0RZfNGmy
z9gF$=yJu!*Qetex*}O}sw^6sOW>)D at K|a19Nvxr5K_~z>d`XCMUh9ByD-_zE<o6`o
zehserN!;83P9#i%Ch;Cpid6$<_H*GNuW7Ou<R7F`$7YQFQi5yvzk|-FL8O3u(*IZn
zBKIerRA7{Tj(P11sv8iXVPNHSf$cyF&L`ZS3hmm12971IrmS5iHKBcdeevvHO%b%+
zz-Kb*>gx8q at rfKX#Q~c{gAYgy2qVp at jse`f3R at 1?>3h(Y86VO?ESmeKd9&G-0(9vj
z`40ep--(PYfD>tXaX<b2{f8TD_4aa6d?)l2AvA$j4U*_FsNj!~`uh3+8tYDJy7h|Q
z40(R2>JEjK5AbPY(DG6~A|BlXW at Qexh(84qyD}ME->3_n9JVK-0o(GE?tEOmuYm%B
z#;}#jt*}@01E+5eyu9qC02tZQ^nH;1rsWkCR-ngJZ+Q-?qZsRztgNiU#igaaeY^<u
zS!vMX$BSMCcP_bY`Af$Lg@<BZ>A1E(QM3_ at U?2woJl+n9v&~spp`jV^KIL{}FB_||
zMEtOpxLpM)Ne9sA1sNshrJlwWrhYe7R7)as+AT&{15ymV)UG-?1fL_o$RR7>9JCRx
z{2wqm;=z!Rby-rRoN2s2j3?!8YU;75_}vh>LLKJl6K=-YmWvlI at Ea7bGr|!>B}drM
zs;#-XQsZBLm5CB*41GC<VN=%XWLpZTlFL at jfB2CU3s*q1s~UUfPOhbEFdV4?*1{g#
zsdxi}M&y9k8N+4Nk?W3dGV9D6brCgrlzdzrOvF9}I4Dw*$g<38#D`*0ry~K{fvut;
z{4hZjGj{Q?l1IzKN0NQl&3_>^>ddC5rX2O3bJ-SKx*X?(G&*r$J_%75kX+#d)xF8C
z+u-Rw4jr*e80KtiZ!bX(8dKLvrT~*4roFg|Kt$S-T)U7NxjW;Q#)L?ar9lrL=7dh&
zE(7BFI>Z|*jw&pG=V$FIG2a9Fb)o&Oi%LY$4)6z8P3w>?I}jxJ3l`8@(}B3Af>p+D
zv;jEHn7XtXL5=+kCKp%rwwWJ(Vuk3%#XgZy7Se&4d-$TEKwmgp!i1fVCPok}xXLie
zRKyQ2<bJq$J;LOzW^|EWAXXg;g&tOvg8c}$jd;0!tC!jv6B9#;TI8l%$kbElbaxD>
zaQ7+YdHMk4cON2BQI4K8F*}P^G2rDFV~VB1f0=WuPn^W#nR_um?t|UxEyIzY@%3sZ
zaf_Mm(*wjDX6<Ftmq9L-IRM7~LA5V==B=%*odDtb(8s(V+6?}uqP*r-U6S*atYHRV
ztII#tlGp4=)qV(p7`D0yEG#`tSXWeb_IV+UhD2)h7I?ySDeK96>1|0|{#`7tuF(s`
zgk2 at +^5CfvasOaK%e;iuC3(4r_gaqMaOnlBMQ`=Gbg7Uh1zzqfAp2qpE?3d1udn|(
zX&>pA*0r^Tkq&12cs1DT6*Q`POU?BRHcLxO-Kam^oSekZc}d`B_MiU(=bvjWOi!*v
zmmU*`$t|gn3SM$I0YkH&FfduG0!PzR5eM#p#GA+xYii&c$%Q6kC?&OwB9!y2OYA|w
zp+YebPVB&<ADXeDK!~enz9E~%8c-CTH)CJc)NJay%O6nlD*(#XL9i8>xof5oA+nlX
zawt&)|J~Rs8jQ-nLfz|BbFo8k1l&?MdtW3X5cqI~WdxAQ5aQ2SsA_2x7{&IpB_a6v
zRGIuN=p!Hr{|u3oEJ&=buJ-O4mQliqN2u&l@{J{Vw&keSBk{FLqykTlIIpf_OMEOx
z{-k&nf4>7wW=2M`9GM7i)FF~&HFDaw<e4wEHX~L@(eWCLT%SO}oLm5JG+Hxu<&Cls
z at qrjhV@jW*6Z|t=R#~}R6s({$Db%vRyL$}9Gm<p705;qMDBJyJ)8n*A3!0X%yl0z+
zxV2V9VKAju#n0Ze_{$Bu%spAUxxkf*!(>~oP<6`QgS{As)lfQqjxw+aUW2reeOD>9
zwZ%-M6U?rzE*(wHf$`B=a#8WQ2Y^ua%TpV9?`kHXpjc*DlHYITDOPOd!d%XkCnrW<
zr(V7!Oz$}*hK>SH!`tj~bc7Oblz5)sm|XA?mVi-oU4*9Q1>8HccfZgAZhLd)M+-Es
ze(!y-whLwHU5_bvh$U2uy4Bc!-q;}X<Rst2g|e!T#0Fuav_Gw#vEXlZS58B3lvYZ6
z50k$IJFJNw8g$P~P>!owa#F8!<zPG;Y{&JQIrN_m`zq~Xl`O%uw&^o=rXBo>!@Isk
zKE;fynZD06eu>$+tzP&3{^2%_&Xu_11eb~e#jezWWSBG``MjydTdlZ}ds?*E*24(X
z_rozc7vJhgKJL at KVWK5aJM^s9xIhf0=by1;TI+P-mw%4R71=HAzU`jvSB!+Wf4UKN
zI-b^aC6wr)OQOrdBzvMKt9mwYkJXoVp5Ghm`S7~ywI8(Uw8=^2><p!)M{mU2{1N3|
z2-JKGV1P1^^YhXmJxBh*ZPU+ylPh65K4pQ1oFA_vOoCqd2<8E4{1tk)1>OI|b#WK4
zyVIbcpgS^0j!^g%87j3LrFcg+V|LNi^;PS;cQ=H?uBBlhLk3*j%v4a@<j#Np?!+;-
z9TEB%ICcV<j?v1AI?@LZj-iV$HEIY11q9?kZF!|=={|szEhsIOuUX~vT!qOQ0I_#B
zn*4e+Gcz-r8c^QX+1VN06C!qD4Ngwp)z;QVz-tVfm at 9G*l%&HHMrloA=AqCZwz=S&
zfQM^XYCr{q{|Z()FtlkvWpDae&?!%T2sQ|>rZkcddp{XwX7;Yanll?l%Bt5+hIu-`
z=QHu1FJQ|WGE*rN+rWPYGk+wWyG}zK#9!tEaWuUuJ3#KgNzIAD0lza0h!&SfVn?J~
zx8BSoW$9RhK!%`_H!H=}Q?`1mkg8?q8%6NueP}(szHQ)S5$8u2A!;ZmrMNkN5vAkC
zzJ7J$@kzWDJ}XLm0k`A=15B1bKPM%$2wzKE&r_wX%h}K3i^4yrNIy$P{Lrk^ljFq&
z%363|3O{A87x`)CeUUg^mFt>hIRJ#q!S#_3PMF=}IT$H=j)A_@<FBXjX>f2|LaE|W
zl1T2)&<5b@=Q$;21~V0At*(~kN3GMu4lG+E+%?eyF?PoBEy!9~8&Xy(oJZNJ at fb_Z
z)zvlSqNitxqO2_1=n2h7PnR;YD#0ky;j!kW^hjr>$#zd!ecW>EykE;H&nkAQ%gJ#_
z2SIax0dUd at e2j_23>5!6Fl)NTRmylW59kdXdpoY0pgnN4v!=6Tce<hU=cWp;CqXD`
zlFD_{+1ZP%%jjF}TwoZLADxGUQ8qaqdW_kc!=V|R3Hp4Q>cOLar=jK(h~5ej*(Jgm
z%ABT(5t)gF9IZ71I0tN?;s&(z82tuL-Tm4U7#C$Rkiv8uo^O&4s500oS&q|>tqIDx
z9~Q*FP3>&1^QpN=!PIwnw6!;M03 at He4wMn;t`BmaXX$X8?TDx+9%DjwcTofF5Y{pb
z=oP}hO)<f68gh{RT<A5{!TT_I^#MI>Z31=#Z22wS+#3J2&VWCeqyCTF-sRkfUVqkZ
zc41A@|8e)Ip+GHutH7lpN(RXe%ZYEjuH*;;5riT?C_Qu at pt4#|<%Rx}CshW7obHQ1
zp965Iv#(E`ns`)K_q9u+9lC6;RpJt%tc5-Q{;x(u;Q|5)Uy{!8SPCGcBdV)4xx`*E
z at c^nP=;_r{PfWZ%WRrp2AMDBuNvv|eA^h*O+#L;paXOtzlQpQP-7m_^a}~Ld7Vw?|
zZ at KzE+C_wgZBho#H($|x0Ob|u7{8ilaqRC)O>qQjlKb&ZIVq`@ypodk_yV`~7<&Rc
zthAr)+7uBHxkF`{yU*toTNQoKAKc38{`XKZ_Mwi&v7mn>%|P?4=`_cZ%1X7bU<A(O
ziVY49E=(asVgpZZ?d<Fv09{-$c;&eXV;h+WZhB+mC&Rq3f3A=MFtBxBH;#Yy?25dg
zb1Hfj#92s#5(xwHIJ|)abjgWGB*uQTh4EP(q!+b!bdaN=%1>gsZ^WJ2`1{(y>_D`a
z{`X?b%NCvB=p2wzcw(`59Y{rrq)1PmY(tRL!h$B=2Y!O+WLIfMQ7AlS$0Sn)p|(kO
zQ;Yr0Ab>UKVlRMuHNV@|E#p1qQ9}Iu7eM`(z%z8H3e^pue^hrLl$^F<cmBMh#q`~s
zH@>cbya>2_S$*(DkegQG{B0aSZU0_Ra}jVZQ#k;t#~JYvGsB~v+u&>ayN%enWWSX>
z_Kh)?ZFL}4fY-<Xawfw0?=OJM>nH@|XaxOGWSpHn&1gALcH!S2$O}%|zUb%Z=m^y~
z2 at -L$AfQ?^jPUvQSSAO!H#LXI|ASJ%fk%#Y{5R|S`?pbyAXp|Otj9;CX?4jR0zQP3
LW+xu&lfwT4J^4GJ

literal 0
HcmV?d00001

-- 
1.7.9.5

From oleonard at myacpl.org  Fri Jul 19 18:27:52 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 19 Jul 2013 12:27:52 -0400
Subject: [Koha-patches] [PATCH] Bug 10586 - Printing cart from Firefox seems
	to be missing CSS
Message-ID: <1374251272-23937-1-git-send-email-oleonard@myacpl.org>

When printing the Cart from Firefox the styling is off even though it
looks correct in preview. I think this may be because the preview is
including stylesheets designated for screen.

This patch removes special handling of JS and CSS assets for the Cart's
print view, letting the page handle print styling like other pages in
the OPAC.

To test, put items in your Cart in the OPAC. Open your Cart and click
the "print" link. Your printout should be correctly styled and match the
preview.
---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt
index 09993af..5f79ac0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt
@@ -2,11 +2,8 @@
 
 [% INCLUDE 'doc-head-open.inc' %]
 [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your cart
-    [% IF ( print_basket ) %]</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
-<meta http-equiv="Content-Language" content="en-us" />
-<script type="text/javascript" src="[% themelang %]/lib/jquery/jquery.js"></script>
+[% INCLUDE 'doc-head-close.inc' %]
+    [% IF ( print_basket ) %]
     <script type="text/javascript">
     //<![CDATA[
     $(document).ready(function(){
@@ -15,10 +12,7 @@
     });
     //]]>
     </script>
-<style type="text/css">
-    @import url([% themelang %]/css/print.css);
-</style>
-    [% ELSE %][% INCLUDE 'doc-head-close.inc' %]
+    [% ELSE %]
     <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
     <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
     <script type="text/javascript">
-- 
1.7.9.5

From oleonard at myacpl.org  Fri Jul 19 18:44:28 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 19 Jul 2013 12:44:28 -0400
Subject: [Koha-patches] [PATCH] Bug 10609 - Use branch name rather than
	branch code in serials-collection.pl
Message-ID: <1374252268-24193-1-git-send-email-oleonard@myacpl.org>

The serials collection page displays branchcode instead of library name.
This patch uses the Branches template plugin to display the library name
instead.

Also corrected: Added missing datatables config include to prevent a
JavaScript error.

To test, view the serials collection page for a subsciption with
existing issues. Library names should be displayed instead of
branchcodes. There should be no JavaScript errors reported by the
browser.
---
 .../prog/en/modules/serials/serials-collection.tt  |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
index b833795..3efe36d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
@@ -1,8 +1,10 @@
+[% USE Branches %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Serials &rsaquo; Serial collection information for [% bibliotitle %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+[% INCLUDE 'datatables-strings.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 
@@ -175,7 +177,7 @@ $(document).ready(function() {
                 [% IF ( subscription.numberpattern7 ) %]
                     None of the above
                 [% END %]</td>
-            <td> [% subscription.branchcode %]</td>
+            <td>[% Branches.GetName( subscription.branchcode ) %]</td>
             <td> [% subscription.callnumber %]</td>
         <td> [% subscription.notes %]
             [% UNLESS subscription.closed %]
@@ -311,7 +313,7 @@ $(document).ready(function() {
                     [% serial.notes %]
                 </td>
                 <td>
-                    [% serial.branchcode %]
+                    [% Branches.GetName( serial.branchcode ) %]
                 </td>
                 [% IF ( routing ) %]
                 <td>
-- 
1.7.9.5

From oleonard at myacpl.org  Fri Jul 19 21:49:28 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 19 Jul 2013 15:49:28 -0400
Subject: [Koha-patches] [PATCH] Bug 3134 - Ability to selelct multiple
	reports to delete at once
Message-ID: <1374263369-26674-1-git-send-email-oleonard@myacpl.org>

This patch adds the option to select multiple saved reports for
deletion.

To test you must have two or more saved reports to delete. Deletion
should work properly when:

- Selecting one report for deletion by checking the box.
- Selecting more than one report for deletion by checking boxes.
- Clicking the old "Delete" link

Clicking the delete button should prompt you to confirm. Clicking cancel
should cancel.

Clicking the delete button when no boxes are checked should trigger an
alert asking you to select reports for deletion.
---
 C4/Reports/Guided.pm                               |   14 ++++++-------
 .../en/modules/reports/guided_reports_start.tt     |   21 +++++++++++++++++---
 reports/guided_reports.pl                          |   11 ++++++++--
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm
index f0db7a3..9447c71 100644
--- a/C4/Reports/Guided.pm
+++ b/C4/Reports/Guided.pm
@@ -609,13 +609,13 @@ sub format_results {
 }	
 
 sub delete_report {
-    my ($id)  = @_;
-    my $dbh   = C4::Context->dbh();
-    my $query = "DELETE FROM saved_sql WHERE id = ?";
-    my $sth   = $dbh->prepare($query);
-    $sth->execute($id);
-}	
-
+    my (@ids) = @_;
+        my $dbh = C4::Context->dbh;
+        my $query = 'DELETE FROM saved_sql WHERE id IN (' . join( ',', ('?') x @ids ) . ')';
+        my $sth = $dbh->prepare($query);
+        $sth->execute(@ids);
+        $sth->finish;
+}
 
 my $SAVED_REPORTS_BASE_QRY = <<EOQ;
 SELECT s.*, r.report, r.date_run, $AREA_NAME_SQL_SNIPPET, av_g.lib AS groupname, av_sg.lib AS subgroupname,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 8c34135..9cc1894 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -122,6 +122,15 @@ $(document).ready(function(){
             rtable.fnSetColumnVis(4, true);
         }
     });
+
+    $("#reports_form").submit(function(){
+        var checkedItems = $("input[name=ids]:checked");
+        if ($(checkedItems).size() == 0) {
+            alert(_("You must select one or more reports to delete"));
+            return false;
+        }
+        return confirm(_("Are you sure you want to delete the selected reports?"));
+    });
 [% END %]
 
 [% IF ( showsql ) %]
@@ -132,7 +141,7 @@ $(document).ready(function(){
 [% IF ( saved1 ) %]
     $(".confirmdelete").click(function(){
         $(this).parents('tr').attr("class","warn");
-        if(confirm("Are you sure you want to "+$(this).attr("title")+"?")){
+        if(confirm(_("Are you sure you want to delete this saved report?"))){
             return true;
         } else {
             $(this).parents('tr').attr("class","");
@@ -273,6 +282,8 @@ canned reports and writing custom SQL reports.</p>
                 <option value="">All</option>
             </select>
         </div>
+<form action="/cgi-bin/koha/reports/guided_reports.pl" id="reports_form" method="post">
+<input type="hidden" name="phase" value="Delete Multiple" />
         <table id="table_reports">
             <thead>
                 <tr>
@@ -297,7 +308,7 @@ canned reports and writing custom SQL reports.</p>
             <tbody>
                 [% FOREACH savedreport IN savedreports %]
                     [% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]
-                        <td>[% savedreport.id %]</td>
+                        <td><label>[% savedreport.id %] <input type="checkbox" name="ids" value="[% savedreport.id %]" /></label></td>
                         <td>[% savedreport.report_name %]</td>
                         <td>[% savedreport.type %]</td>
                         <td>[% savedreport.groupname %]</td>
@@ -317,7 +328,7 @@ canned reports and writing custom SQL reports.</p>
                             <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Show%20SQL">Show</a>
                             [% IF ( CAN_user_reports_create_reports ) %]
                                 <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Edit%20SQL">Edit</a>
-                                <a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% savedreport.savedsql |uri %]&amp;reportname=[% savedreport.report_name |uri %]&amp;notes=[% savedreport.notes |uri %]">Duplicate</a>
+                                <a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL&amp;sql=[% savedreport.savedsql |uri %]&amp;reportname=[% savedreport.report_name |uri %]&amp;notes=[% savedreport.notes |uri %]">Duplicate</a>
                             [% END %]
                         </td>
                         <td>
@@ -331,6 +342,10 @@ canned reports and writing custom SQL reports.</p>
                 [% END %]
             </tbody>
         </table>
+        <fieldset class="action">
+            <input type="submit" value="Delete selected" />
+        </fieldset>
+    </form>
     </div>
 </div>
 [% ELSE %]<div class="dialog message">
diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index 929feea..b9c49ad 100755
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -108,11 +108,18 @@ elsif ( $phase eq 'Build new' ) {
     );
 }
 
+elsif ( $phase eq 'Delete Multiple') {
+    my @ids = $input->param('ids');
+    delete_report( @ids );
+    print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved");
+    exit;
+}
+
 elsif ( $phase eq 'Delete Saved') {
 	
 	# delete a report from the saved reports list
-	my $id = $input->param('reports');
-	delete_report($id);
+    my $ids = $input->param('reports');
+    delete_report($ids);
     print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved");
 	exit;
 }		
-- 
1.7.9.5

From oleonard at myacpl.org  Fri Jul 19 22:14:18 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 19 Jul 2013 16:14:18 -0400
Subject: [Koha-patches] [PATCH] Bug 10516 - Improve titles, breadcrumbs,
	and confirmation messages for Z39.50 server adds and updates
Message-ID: <1374264858-27406-1-git-send-email-oleonard@myacpl.org>

The template for adding/editing Z39.50 servers shows the same title,
breadcrumbs, etc. for add and edit operations. This patch creates
separate text for each case.

To test, try both adding and editing a Z39.50 server. The page title,
breadcrumb, and heading should correctly reflect the operation you
perform.
---
 admin/z3950servers.pl                              |    3 ++-
 .../prog/en/modules/admin/z3950servers.tt          |   16 +++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl
index 92cc3e5..87711c1 100755
--- a/admin/z3950servers.pl
+++ b/admin/z3950servers.pl
@@ -104,12 +104,12 @@ if ($op eq 'add_form') {
 ################## ADD_VALIDATE ##################################
 # called by add_form, used to insert/modify data in DB
 } elsif ($op eq 'add_validate') {
-	$template->param(add_validate => 1);
 	my $dbh=C4::Context->dbh;
 	my $sth=$dbh->prepare("select * from z3950servers where name=?");
 	$sth->execute($input->param('searchfield'));
 	my $checked = $input->param('checked') ? 1 : 0;
 	if ($sth->rows) {
+        $template->param(confirm_update => 1);
 		$sth=$dbh->prepare("update z3950servers set host=?, port=?, db=?, userid=?, password=?, name=?, checked=?, rank=?,syntax=?,encoding=?,timeout=? where name=?");
 		$sth->execute($input->param('host'),
 		      $input->param('port'),
@@ -126,6 +126,7 @@ if ($op eq 'add_form') {
 		      );
 	} 
 	else {
+        $template->param(confirm_add => 1);
 		$sth=$dbh->prepare(
 		  "INSERT INTO z3950servers " .
 		  "(host,port,db,userid,password,name,checked,rank,syntax,encoding,timeout) " .
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
index 18f92fc..fa61123 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
@@ -2,7 +2,8 @@
 <title>Koha &rsaquo; Administration &rsaquo; [% IF ( else ) %]Z39.50 servers[% END %]
 [% IF ( add_form ) %] Z39.50 servers &rsaquo; [% IF ( searchfield ) %]Modify Z39.50 server [% searchfield %][% ELSE %]New Z39.50 server[% END %][% END %]
 [% IF ( delete_confirm ) %]Z39.50 servers &rsaquo; Confirm deletion[% END %]
-[% IF ( add_validate ) %]Z39.50 servers &rsaquo; Z39.50 server added[% END %]
+[% IF ( confirm_add ) %] Z39.50 servers &rsaquo; Z39.50 server added[% END %]
+[% IF ( confirm_update ) %] Z39.50 servers &rsaquo; Z39.50 server updated[% END %]
 [% IF ( delete_confirmed ) %]Z39.50 servers &rsaquo; Z39.50 server deleted[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% IF ( else ) %]
@@ -94,7 +95,9 @@
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( else ) %]Z39.50 servers[% END %]
 [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; [% IF ( searchfield ) %]Modify Z39.50 server [% searchfield %][% ELSE %]New Z39.50 server[% END %][% END %]
 [% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; Confirm deletion[% END %]
-[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; Z39.50 server added[% END %]
+[% IF ( confirm_add ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; Z39.50 server added[% END %]
+[% IF ( confirm_update ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; Z39.50 server updated[% END %]
+
 [% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; Z39.50 server deleted[% END %]</div>
 
 <div id="doc3" class="yui-t2">
@@ -244,13 +247,20 @@
         </form>
 [% END %]
 
-[% IF ( add_validate ) %]
+[% IF ( confirm_add ) %]
 <h3>Z39.50 server added</h3>
 <form action="[% script_name %]" method="post">
         <input type="submit" value="OK" />
         </form>
 [% END %]
 
+[% IF ( confirm_update ) %]
+<h3>Z39.50 server updated</h3>
+<form action="[% script_name %]" method="post">
+        <input type="submit" value="OK" />
+        </form>
+[% END %]
+
 [% IF ( delete_confirm ) %]
 	[% reqsel %]
 <h3>Confirm deletion of server [% searchfield %]</h3>
-- 
1.7.9.5

From srdjan at catalyst.net.nz  Wed Jul 24 05:12:37 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 24 Jul 2013 15:12:37 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] C4::Branch.pm needs unit tests
Message-ID: <1374635557-12489-1-git-send-email-srdjan@catalyst.net.nz>

From: Kenza Zaki <kenza.zaki at biblibre.com>

Unit tests are wrap in a transaction.

To test:
prove t/db_dependent/Branch.t
t/db_dependent/Branch.t .. 1/36 Using a hash as a reference is deprecated at t/db_dependent/Branch.t line 207.
t/db_dependent/Branch.t .. ok
All tests successful.
Files=1, Tests=36,  1 wallclock secs ( 0.02 usr  0.02 sys +  0.13 cusr  0.01 csys =  0.18 CPU)
Result: PASS

http://bugs.koha-community.org/show_bug.cgi?id=10508
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 t/db_dependent/Branch.t | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/t/db_dependent/Branch.t b/t/db_dependent/Branch.t
index 4251816..ffa2346 100644
--- a/t/db_dependent/Branch.t
+++ b/t/db_dependent/Branch.t
@@ -21,7 +21,7 @@ use Modern::Perl;
 use C4::Context;
 use Data::Dumper;
 
-use Test::More ;#tests => 6;
+use Test::More tests => 36;
 
 use C4::Branch;
 
@@ -161,7 +161,7 @@ is( GetBranchesCount, $count + 1,
     "A branch has been modified, no new branch added" );
 $branchdetail = GetBranchDetail( $b1->{branchcode} );
 $b1->{issuing} = undef;
-is_deeply( $branchdetail, $b1 );
+is_deeply( $branchdetail, $b1 , "GetBranchDetail gives the details of BRA");
 
 #Test categories
 my $categories = GetBranchCategories;
@@ -350,4 +350,3 @@ is( scalar(@$loop), GetBranchesCount, 'There is the right number of branches' );
 # End transaction
 $dbh->rollback;
 
-done_testing;
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Wed Jul 24 06:35:36 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 24 Jul 2013 16:35:36 +1200
Subject: [Koha-patches] [PATCH] Bug 7785 - MySQL-specific syntax in
	C4::Members columns()
Message-ID: <1374640536-22202-1-git-send-email-srdjan@catalyst.net.nz>

From: Mark Tompsett <mtompset at hotmail.com>

The initial thought was to remove this function. However,
tools/import_borrowers.pl uses it. So rather than remove
it to solve the problem, it was reworked to a more generic
solution which runs faster.

By accessing $sth->{NAME} directly, the driver becomes
responsible for filling it correctly. This happens when a SELECT
is done on the borrowers table. It does not even have to have
data in the result set!

The columns method could be more generic and used elsewhere too.
Comparison between the old method and the STH method showed a
significant time difference. The old method took 35 seconds
for 40k iterations versus 19 seconds for the same amount of
iterations with the STH method regardless of the size of the
borrowers table.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Members.pm                    | 48 ++++++++++++++++++++++++++++++++++++++--
 t/db_dependent/Members_columns.t | 24 ++++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 t/db_dependent/Members_columns.t

diff --git a/C4/Members.pm b/C4/Members.pm
index 6d8d23a..f3dbebd 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -695,10 +695,54 @@ sub GetMemberIssuesAndFines {
     return ($overdue_count, $issue_count, $total_fines);
 }
 
-sub columns(;$) {
-    return @{C4::Context->dbh->selectcol_arrayref("SHOW columns from borrowers")};
+
+=head2 columns
+
+  C4::Member->columns
+
+=head3 USAGE
+
+ use C4::Member;
+ my @borrower_columns = C4::Member->columns;
+
+=head3 RETURNS
+
+ The array of borrowers' table columns on success.
+ An empty array on failure.
+
+=head3 NOTES
+
+ This runs significantly faster than the previous code while
+ being mostly SQL-agnostic.
+
+=cut
+
+sub columns {
+
+    # Pure ANSI SQL goodness.
+    my $sql = 'SELECT * FROM borrowers WHERE 1=0;';
+
+    # Get the database handle.
+    my $dbh = C4::Context->dbh;
+
+    # Run the SQL statement to load STH's readonly properties.
+    my $sth = $dbh->prepare($sql);
+    my $rv = $sth->execute();
+
+    # This only fails if the table doesn't exist.
+    # This will always be called AFTER an install or upgrade,
+    # so borrowers will exist!
+    my @data;
+    if ($sth->{NUM_OF_FIELDS}>0) {
+        @data = @{$sth->{NAME}};
+    }
+    else {
+        @data = ();
+    }
+    return @data;
 }
 
+
 =head2 ModMember
 
   my $success = ModMember(borrowernumber => $borrowernumber,
diff --git a/t/db_dependent/Members_columns.t b/t/db_dependent/Members_columns.t
new file mode 100644
index 0000000..7a70ce4
--- /dev/null
+++ b/t/db_dependent/Members_columns.t
@@ -0,0 +1,24 @@
+#!/usr/bin/perl
+#
+# This is to test C4/Members
+# It requires a working Koha database with the sample data
+
+use Modern::Perl;
+
+use Test::More tests => 2;
+
+BEGIN {
+    use_ok('C4::Members');
+}
+
+my @borrowers_columns = C4::Members->columns;
+ok(
+    $#borrowers_columns > 1,
+    'C4::Member->column returned a reasonable number of columns ('
+      . ( $#borrowers_columns + 1 ) . ')'
+  )
+  or diag(
+'WARNING: Check that the borrowers table exists and has the correct fields defined.'
+  );
+
+exit;
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Wed Jul 24 06:46:42 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 24 Jul 2013 16:46:42 +1200
Subject: [Koha-patches] [PATCH] Bug 10446 - System preference maxoutstanding
	is poorly named
Message-ID: <1374641202-23961-1-git-send-email-srdjan@catalyst.net.nz>

From: Kyle M Hall <kyle at bywatersolutions.com>

The system preference 'maxoutstanding' is defined as the maximum amount
of fees owed by the patron before Koha should block placing holds, but
the name does not describe its behavior very well.

String changes only, no functional changes made.

Test Plan:
1) Apply patch
2) Run updatedatabase.pl
3) Verify the new system preference FeesBlockHoldsAmount's value matches
   the previous value of maxoutstanding.
4) Set FeesBlockHoldsAmount to $10
5) Attempt to place an OPAC hold for a patron owing less than $10
   This attempt should succeed.
6) Attempt to place an OPAC hold for a patron owing more than $10
   This attempt should fail

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/SIP/ILS/Patron.pm                                               | 2 +-
 installer/data/mysql/sysprefs.sql                                  | 2 +-
 installer/data/mysql/updatedatabase.pl                             | 7 +++++++
 .../prog/en/modules/admin/preferences/circulation.pref             | 2 +-
 opac/opac-reserve.pl                                               | 6 +++---
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/C4/SIP/ILS/Patron.pm b/C4/SIP/ILS/Patron.pm
index da4290b..21f06ce 100644
--- a/C4/SIP/ILS/Patron.pm
+++ b/C4/SIP/ILS/Patron.pm
@@ -329,7 +329,7 @@ sub excessive_fines {
 
 sub holds_blocked_by_excessive_fees {
     return ( $self->fee_amount
-          && $self->fee_amount > C4::Context->preference("maxoutstanding") );
+          && $self->fee_amount > C4::Context->preference("FeesBlockHoldsAmount") );
 }
     
 sub library_name {
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index e3c0f3d..97b1269 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -56,7 +56,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 -- INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marcflavour','MARC21','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MARCOrgCode','OSt','Define MARC Organization Code - http://www.loc.gov/marc/organizations/orgshome.html','','free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MaxFine',NULL,'Maximum fine a patron can have for all late returns at one moment. Single item caps are specified in the circulation rules matrix.','','Integer');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxoutstanding',5,'maximum amount withstanding to be able make holds','','Integer');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FeesBlockHoldsAmount',5,'maximum amount withstanding to be able make holds','','Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxreserves',50,'Define maximum number of holds a patron can place','','Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxItemsInSearchResults',20,'Specify the maximum number of items to display for each result on a page of results',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('memberofinstitution',0,'If ON, patrons can be linked to institutions',NULL,'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index ebb195c..6da97ed 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -7058,6 +7058,13 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.13.00.XXX";
+if ( CheckVersion($DBversion) ) {
+    $dbh->do("UPDATE systempreferences SET variable = 'FeesBlockHoldsAmount' WHERE variable = 'maxoutstanding'");
+    print "Upgrade to $DBversion done (Bug 10446 - System preference maxoutstanding is poorly named)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index c286ed1..53cf04f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -241,7 +241,7 @@ Circulation:
             - a renewal notice according to patron checkout alert preferences.
         -
             - Prevent patrons from making holds on the OPAC if they owe more than
-            - pref: maxoutstanding
+            - pref: FeesBlockHoldsAmount
               class: currency
             - '[% local_currency %] in fines.'
         -
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index be72e84..26814db 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -285,9 +285,9 @@ if ( $query->param('place_reserve') ) {
 #
 #
 my $noreserves     = 0;
-my $maxoutstanding = C4::Context->preference("maxoutstanding");
-$template->param( noreserve => 1 ) unless $maxoutstanding;
-if ( $borr->{'amountoutstanding'} && ($borr->{'amountoutstanding'} > $maxoutstanding) ) {
+my $FeesBlockHoldsAmount = C4::Context->preference("FeesBlockHoldsAmount");
+$template->param( noreserve => 1 ) unless $FeesBlockHoldsAmount;
+if ( $borr->{'amountoutstanding'} && ($borr->{'amountoutstanding'} > $FeesBlockHoldsAmount) ) {
     my $amount = sprintf "\$%.02f", $borr->{'amountoutstanding'};
     $template->param( message => 1 );
     $noreserves = 1;
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Fri Jul 26 00:50:50 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Fri, 26 Jul 2013 10:50:50 +1200
Subject: [Koha-patches] [PATCH] C4::Bookseller.pm need unit tests
Message-ID: <1374792650-3270-1-git-send-email-srdjan@catalyst.net.nz>

From: Kenza Zaki <kenza.zaki at biblibre.com>

The tests are wrap in a transaction.

NOTE: some tests should pass but doesn't because of incoherences in the code.
These tests are in comments and preceded by FIXME

Test plan:
prove t/db_dependent/Bookseller.t
t/db_dependent/Bookseller.t .. 15/53
[Some warnings about uninitialised values]
t/db_dependent/Bookseller.t .. ok
All tests successful.
Files=1, Tests=53,  1 wallclock secs ( 0.02 usr  0.00 sys +  0.46 cusr  0.03 csys =  0.51 CPU)
Result: PASS

http://bugs.koha-community.org/show_bug.cgi?id=10528

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 t/db_dependent/Bookseller.t | 694 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 694 insertions(+)
 create mode 100644 t/db_dependent/Bookseller.t

diff --git a/t/db_dependent/Bookseller.t b/t/db_dependent/Bookseller.t
new file mode 100644
index 0000000..71307f1
--- /dev/null
+++ b/t/db_dependent/Bookseller.t
@@ -0,0 +1,694 @@
+#!/usr/bin/perl
+
+use Modern::Perl;
+
+use Test::More tests => 53;
+use C4::Context;
+use Koha::DateUtils;
+use DateTime::Duration;
+use C4::Acquisition;
+use C4::Serials;
+use C4::Budgets;
+use C4::Biblio;
+
+BEGIN {
+    use_ok('C4::Bookseller');
+}
+
+can_ok(
+
+    'C4::Bookseller', qw(
+      AddBookseller
+      DelBookseller
+      GetBookSeller
+      GetBookSellerFromId
+      GetBooksellersWithLateOrders
+      ModBookseller )
+);
+
+#Start transaction
+my $dbh = C4::Context->dbh;
+$dbh->{RaiseError} = 1;
+$dbh->{AutoCommit} = 0;
+
+#Start tests
+$dbh->do(q|DELETE FROM aqorders|);
+$dbh->do(q|DELETE FROM aqbasket|);
+$dbh->do(q|DELETE FROM aqbooksellers|);
+#Test AddBookseller
+my $count            = scalar( C4::Bookseller::GetBookSeller('') );
+my $sample_supplier1 = {
+    name          => 'Name1',
+    address1      => 'address1_1',
+    address2      => 'address1-2',
+    address3      => 'address1_2',
+    address4      => 'address1_2',
+    postal        => 'postal1',
+    phone         => 'phone1',
+    accountnumber => 'accountnumber1',
+    fax           => 'fax1',
+    url           => 'url1',
+    contact       => 'contact1',
+    contpos       => 'contpos1',
+    contphone     => 'contphone1',
+    contfax       => 'contefax1',
+    contaltphone  => 'contaltphone1',
+    contemail     => 'contemail1',
+    contnotes     => 'contnotes1',
+    active        => 1,
+    gstreg        => 1,
+    listincgst    => 1,
+    invoiceincgst => 1,
+    gstrate       => '1.0000',
+    discount      => '1.0000',
+    notes         => 'notes1',
+    deliverytime  => undef
+};
+my $sample_supplier2 = {
+    name          => 'Name2',
+    address1      => 'address1_2',
+    address2      => 'address2-2',
+    address3      => 'address3_2',
+    address4      => 'address4_2',
+    postal        => 'postal2',
+    phone         => 'phone2',
+    accountnumber => 'accountnumber2',
+    fax           => 'fax2',
+    url           => 'url2',
+    contact       => 'contact2',
+    contpos       => 'contpos2',
+    contphone     => 'contphone2',
+    contfax       => 'contefax2',
+    contaltphone  => 'contaltphone2',
+    contemail     => 'contemail2',
+    contnotes     => 'contnotes2',
+    active        => 1,
+    gstreg        => 1,
+    listincgst    => 1,
+    invoiceincgst => 1,
+    gstrate       => '2.0000',
+    discount      => '2.0000',
+    notes         => 'notes2',
+    deliverytime  => 2,
+};
+
+my $id_supplier1 = C4::Bookseller::AddBookseller($sample_supplier1);
+my $id_supplier2 = C4::Bookseller::AddBookseller($sample_supplier2);
+
+#my $id_bookseller3 = C4::Bookseller::AddBookseller();# NOTE : Doesn't work because the field name cannot be null
+
+like( $id_supplier1, '/^\d+$/', "AddBookseller for supplier1 return an id" );
+like( $id_supplier2, '/^\d+$/', "AddBookseller for supplier2 return an id" );
+is( scalar( C4::Bookseller::GetBookSeller('') ),
+    $count + 2, "Supplier1 and Supplier2 have been added" );
+
+#Test DelBookseller
+my $del = C4::Bookseller::DelBookseller($id_supplier1);
+#FIXME: DelBookSeller always returns undef (if it works or not)
+#is( $del, 1, "DelBookseller returns 1 - 1 supplier has been deleted " );
+is( C4::Bookseller::GetBookSellerFromId($id_supplier1),
+    undef, "Supplier1  has been deleted - id_supplier1 doesnt exist anymore" );
+
+#Test GetBookSeller
+my @bookseller2 = C4::Bookseller::GetBookSeller( $sample_supplier2->{name} );
+is( scalar(@bookseller2), 1, "Get only  Supplier2" );
+$bookseller2[0] = field_filter( $bookseller2[0] );
+delete $bookseller2[0]->{basketcount};
+
+$sample_supplier2->{id} = $id_supplier2;
+is_deeply( $bookseller2[0], $sample_supplier2,
+    "GetBookSeller returns the right informations about $sample_supplier2" );
+
+$id_supplier1 = C4::Bookseller::AddBookseller($sample_supplier1);
+my @booksellers = C4::Bookseller::GetBookSeller('')
+  ;    #NOTE :without params, it returns all the booksellers
+for my $i ( 0 .. scalar(@booksellers) - 1 ) {
+    $booksellers[$i] = field_filter( $booksellers[$i] );
+    delete $booksellers[$i]->{basketcount};
+}
+
+$sample_supplier1->{id} = $id_supplier1;
+is( scalar(@booksellers), $count + 2, "Get  Supplier1 and Supplier2" );
+my @tab = ( $sample_supplier1, $sample_supplier2 );
+is_deeply( \@booksellers, \@tab,
+    "Returns right fields of Supplier1 and Supplier2" );
+
+#Test basketcount
+my @bookseller1 = C4::Bookseller::GetBookSeller( $sample_supplier1->{name} );
+#FIXME : if there is 0 basket, GetBookSeller returns 1 as basketcount
+#is( $bookseller1[0]->{basketcount}, 0, 'Supplier1 has 0 basket' );
+my $sample_basket1 =
+  C4::Acquisition::NewBasket( $id_supplier1, 'authorisedby1', 'basketname1' );
+my $sample_basket2 =
+  C4::Acquisition::NewBasket( $id_supplier1, 'authorisedby2', 'basketname2' );
+ at bookseller1 = C4::Bookseller::GetBookSeller( $sample_supplier1->{name} );
+is( $bookseller1[0]->{basketcount}, 2, 'Supplier1 has 2 baskets' );
+
+#Test GetBookSellerFromId
+my $bookseller1fromid = C4::Bookseller::GetBookSellerFromId();
+is( $bookseller1fromid, undef,
+    "GetBookSellerFromId returns undef if no id given" );
+$bookseller1fromid = C4::Bookseller::GetBookSellerFromId($id_supplier1);
+$bookseller1fromid = field_filter($bookseller1fromid);
+delete $bookseller1fromid->{basketcount};
+delete $bookseller1fromid->{subscriptioncount};
+is_deeply( $bookseller1fromid, $sample_supplier1,
+    "Get Supplier1 (GetBookSellerFromId)" );
+
+#Test basketcount
+$bookseller1fromid = C4::Bookseller::GetBookSellerFromId($id_supplier1);
+is( $bookseller1fromid->{basketcount}, 2, 'Supplier1 has 2 baskets' );
+
+#Test subscriptioncount
+my $dt_today    = dt_from_string;
+my $today       = output_pref( $dt_today, 'iso', '24hr', 1 );
+
+my $dt_today1 = dt_from_string;
+my $dur5 = DateTime::Duration->new( days => -5 );
+$dt_today1->add_duration($dur5);
+my $daysago5 = output_pref( $dt_today1, 'iso', '24hr', 1 );
+
+my $budgetperiod = C4::Budgets::AddBudgetPeriod({
+    budget_period_startdate => $daysago5,
+    budget_period_enddate   => $today,
+    budget_description      => "budget desc"
+});
+my $id_budget = AddBudget({
+    budget_code        => "CODE",
+    budget_amount      => "123.132",
+    budget_name        => "Budgetname",
+    budget_notes       => "This is a note",
+    budget_description => "BudgetDescription",
+    budget_active      => 1,
+    budget_period_id   => $budgetperiod
+});
+my ($biblionumber, $biblioitemnumber) = AddBiblio(MARC::Record->new, '');
+$bookseller1fromid = C4::Bookseller::GetBookSellerFromId($id_supplier1);
+is( $bookseller1fromid->{subscriptioncount},
+    0, 'Supplier1 has 0 subscription' );
+my $id_subscription1 = C4::Serials::NewSubscription(
+    undef,      "",            $id_supplier1, undef,
+    $id_budget, $biblionumber, '01-01-2013',  undef,
+    undef,      undef,         undef,         undef,
+    undef,      undef,         undef,         undef,
+    undef,      undef,         undef,         undef,
+    undef,      undef,         undef,         undef,
+    undef,      undef,         undef,         undef,
+    undef,      undef,         undef,         1,
+    "notes",    undef,         undef,         undef,
+    undef,      undef,         undef,         0,
+    "intnotes", 0,             undef,         undef,
+    0,          undef,         '31-12-2013',
+);
+my $id_subscription2 = C4::Serials::NewSubscription(
+    undef,      "",            $id_supplier1, undef,
+    $id_budget, $biblionumber, '01-01-2013',  undef,
+    undef,      undef,         undef,         undef,
+    undef,      undef,         undef,         undef,
+    undef,      undef,         undef,         undef,
+    undef,      undef,         undef,         undef,
+    undef,      undef,         undef,         undef,
+    undef,      undef,         undef,         1,
+    "notes",    undef,         undef,         undef,
+    undef,      undef,         undef,         0,
+    "intnotes", 0,             undef,         undef,
+    0,          undef,         '31-12-2013',
+);
+$bookseller1fromid = C4::Bookseller::GetBookSellerFromId($id_supplier1);
+is( $bookseller1fromid->{subscriptioncount},
+    2, 'Supplier1 has 2 subscriptions' );
+
+#Test ModBookseller
+$sample_supplier2 = {
+    id            => $id_supplier2,
+    name          => 'Name2 modified',
+    address1      => 'address1_2 modified',
+    address2      => 'address2-2 modified',
+    address3      => 'address3_2 modified',
+    address4      => 'address4_2 modified',
+    postal        => 'postal2 modified',
+    phone         => 'phone2 modified',
+    accountnumber => 'accountnumber2 modified',
+    fax           => 'fax2 modified',
+    url           => 'url2 modified',
+    contact       => 'contact2 modified',
+    contpos       => 'contpos2 modified',
+    contphone     => 'contphone2 modified',
+    contfax       => 'contefax2 modified',
+    contaltphone  => 'contaltphone2 modified',
+    contemail     => 'contemail2 modified',
+    contnotes     => 'contnotes2 modified',
+    active        => 1,
+    gstreg        => 1,
+    listincgst    => 1,
+    invoiceincgst => 1,
+    gstrate       => '2.0000 ',
+    discount      => '2.0000',
+    notes         => 'notes2 modified',
+    deliverytime  => 2,
+};
+
+#FIXME : ModBookseller always returns undef, even if the id isn't given
+#or doesn't exist
+my $modif1 = C4::Bookseller::ModBookseller();
+is( $modif1, undef,
+    "ModBookseller returns undef if no params given - Nothing happened" );
+$modif1 = C4::Bookseller::ModBookseller($sample_supplier2);
+#is( $modif1, 1, "ModBookseller modifies only the supplier2" );
+is( scalar( C4::Bookseller::GetBookSeller('') ),
+    $count + 2, "Supplier2 has been modified - Nothing added" );
+
+$modif1 = C4::Bookseller::ModBookseller(
+    {
+        id   => -1,
+        name => 'name3'
+    }
+);
+#is( $modif1, '0E0',
+#    "ModBookseller returns OEO if the id doesnt exist - Nothing modified" );
+
+#Test GetBooksellersWithLateOrders
+#Add 2 suppliers
+my $sample_supplier3 = {
+    name          => 'Name3',
+    address1      => 'address1_3',
+    address2      => 'address1-3',
+    address3      => 'address1_3',
+    address4      => 'address1_3',
+    postal        => 'postal3',
+    phone         => 'phone3',
+    accountnumber => 'accountnumber3',
+    fax           => 'fax3',
+    url           => 'url3',
+    contact       => 'contact3',
+    contpos       => 'contpos3',
+    contphone     => 'contphone3',
+    contfax       => 'contefax3',
+    contaltphone  => 'contaltphone3',
+    contemail     => 'contemail3',
+    contnotes     => 'contnotes3',
+    active        => 1,
+    gstreg        => 1,
+    listincgst    => 1,
+    invoiceincgst => 1,
+    gstrate       => '3.0000',
+    discount      => '3.0000',
+    notes         => 'notes3',
+    deliverytime  => 3
+};
+my $sample_supplier4 = {
+    name          => 'Name4',
+    address1      => 'address1_4',
+    address2      => 'address1-4',
+    address3      => 'address1_4',
+    address4      => 'address1_4',
+    postal        => 'postal4',
+    phone         => 'phone4',
+    accountnumber => 'accountnumber4',
+    fax           => 'fax4',
+    url           => 'url4',
+    contact       => 'contact4',
+    contpos       => 'contpos4',
+    contphone     => 'contphone4',
+    contfax       => 'contefax4',
+    contaltphone  => 'contaltphone4',
+    contemail     => 'contemail4',
+    contnotes     => 'contnotes4',
+    active        => 1,
+    gstreg        => 1,
+    listincgst    => 1,
+    invoiceincgst => 1,
+    gstrate       => '3.0000',
+    discount      => '3.0000',
+    notes         => 'notes3',
+};
+my $id_supplier3 = C4::Bookseller::AddBookseller($sample_supplier3);
+my $id_supplier4 = C4::Bookseller::AddBookseller($sample_supplier4);
+
+#Add 2 baskets
+my $sample_basket3 =
+  C4::Acquisition::NewBasket( $id_supplier3, 'authorisedby3', 'basketname3',
+    'basketnote3' );
+my $sample_basket4 =
+  C4::Acquisition::NewBasket( $id_supplier4, 'authorisedby4', 'basketname4',
+    'basketnote4' );
+
+#Modify the basket to add a close date
+my $basket1info = {
+    basketno     => $sample_basket1,
+    closedate    => $today,
+    booksellerid => $id_supplier1
+};
+
+my $basket2info = {
+    basketno     => $sample_basket2,
+    closedate    => $daysago5,
+    booksellerid => $id_supplier2
+};
+
+my $dt_today2 = dt_from_string;
+my $dur10 = DateTime::Duration->new( days => -10 );
+$dt_today2->add_duration($dur10);
+my $daysago10 = output_pref( $dt_today2, 'iso', '24hr', 1 );
+my $basket3info = {
+    basketno  => $sample_basket3,
+    closedate => $daysago10,
+};
+
+my $basket4info = {
+    basketno  => $sample_basket4,
+    closedate => $today,
+};
+ModBasket($basket1info);
+ModBasket($basket2info);
+ModBasket($basket3info);
+ModBasket($basket4info);
+
+#Add 1 subscription
+my $id_subscription3 = C4::Serials::NewSubscription(
+    undef,      "",            $id_supplier3, undef,
+    $id_budget, $biblionumber, '01-01-2013',  undef,
+    undef,      undef,         undef,         undef,
+    undef,      undef,         undef,         undef,
+    undef,      undef,         undef,         undef,
+    undef,      undef,         undef,         undef,
+    undef,      undef,         undef,         undef,
+    undef,      undef,         undef,         1,
+    "notes",    undef,         undef,         undef,
+    undef,      undef,         undef,         0,
+    "intnotes", 0,             undef,         undef,
+    0,          undef,         '31-12-2013',
+);
+
+#Add 4 orders
+my ( $ordernumber1, $ordernumber2, $ordernumber3, $ordernumber4 );
+my ( $basketno1,    $basketno2,    $basketno3,    $basketno4 );
+( $basketno1, $ordernumber1 ) = C4::Acquisition::NewOrder(
+    {
+        basketno         => $sample_basket1,
+        quantity         => 24,
+        biblionumber     => $biblionumber,
+        budget_id        => $id_budget,
+        entrydate        => '01-01-2013',
+        currency         => 'EUR',
+        notes            => "This is a note1",
+        gstrate          => 0.0500,
+        orderstatus      => 1,
+        subscriptionid   => $id_subscription1,
+        quantityreceived => 2,
+        rrp              => 10,
+        ecost            => 10,
+        datereceived     => '01-06-2013'
+    }
+);
+( $basketno2, $ordernumber2 ) = C4::Acquisition::NewOrder(
+    {
+        basketno       => $sample_basket2,
+        quantity       => 20,
+        biblionumber   => $biblionumber,
+        budget_id      => $id_budget,
+        entrydate      => '01-01-2013',
+        currency       => 'EUR',
+        notes          => "This is a note2",
+        gstrate        => 0.0500,
+        orderstatus    => 1,
+        subscriptionid => $id_subscription2,
+        rrp            => 10,
+        ecost          => 10,
+    }
+);
+( $basketno3, $ordernumber3 ) = C4::Acquisition::NewOrder(
+    {
+        basketno       => $sample_basket3,
+        quantity       => 20,
+        biblionumber   => $biblionumber,
+        budget_id      => $id_budget,
+        entrydate      => '02-02-2013',
+        currency       => 'EUR',
+        notes          => "This is a note3",
+        gstrate        => 0.0500,
+        orderstatus    => 2,
+        subscriptionid => $id_subscription3,
+        rrp            => 11,
+        ecost          => 11,
+    }
+);
+( $basketno4, $ordernumber4 ) = C4::Acquisition::NewOrder(
+    {
+        basketno         => $sample_basket4,
+        quantity         => 20,
+        biblionumber     => $biblionumber,
+        budget_id        => $id_budget,
+        entrydate        => '02-02-2013',
+        currency         => 'EUR',
+        notes            => "This is a note3",
+        gstrate          => 0.0500,
+        orderstatus      => 2,
+        subscriptionid   => $id_subscription3,
+        rrp              => 11,
+        ecost            => 11,
+        quantityreceived => 20
+    }
+);
+
+#Test cases:
+# Sample datas :
+#   Supplier1: delivery -> undef Basket1 : closedate -> today
+#   Supplier2: delivery -> 2     Basket2 : closedate -> $daysago5
+#   Supplier3: delivery -> 3     Basket3 : closedate -> $daysago10
+#Case 1 : Without parameters:
+#   quantityreceived < quantity AND rrp <> 0 AND ecost <> 0 AND quantity - COALESCE(quantityreceived,0) <> 0 AND closedate IS NOT NULL -LATE-
+#   datereceived !null AND rrp <> 0 AND ecost <> 0 AND quantity - COALESCE(quantityreceived,0) <> 0 AND closedate IS NOT NULL -LATE-
+#   datereceived !null AND rrp <> 0 AND ecost <> 0 AND quantity - COALESCE(quantityreceived,0) <> 0 AND closedate IS NOT NULL -LATE-
+#   quantityreceived = quantity -NOT LATE-
+my %suppliers = C4::Bookseller::GetBooksellersWithLateOrders();
+ok( exists( $suppliers{$id_supplier1} ), "Supplier1 has late orders" );
+ok( exists( $suppliers{$id_supplier2} ), "Supplier2 has late orders" );
+ok( exists( $suppliers{$id_supplier3} ), "Supplier3 has late orders" );
+isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" )
+  ;    # Quantity = quantityreceived
+
+#Case 2: With $delay = 4
+#    today + 0 > now-$delay -NOT LATE-
+#    (today-5) + 2   <= now() - $delay -NOT LATE-
+#    (today-10) + 3  <= now() - $delay -LATE-
+#    quantityreceived = quantity -NOT LATE-
+%suppliers = C4::Bookseller::GetBooksellersWithLateOrders( 4, undef, undef );
+isnt( exists( $suppliers{$id_supplier1} ),
+    1, "Supplier1 has late orders but  today  > now() - 4 days" );
+#FIXME: If only the field delay is given, it doen't consider the deliverytime
+#isnt( exists( $suppliers{$id_supplier2} ),
+#    1, "Supplier2 has late orders and $daysago5 <= now() - (4 days+2)" );
+ok( exists( $suppliers{$id_supplier3} ),
+    "Supplier3 has late orders and $daysago10  <= now() - (4 days+3)" );
+isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
+
+#Case 3: With $delay = -1
+#FIXME: GetBooksellersWithLateOrders doesn't test if the delay is a positive value
+#is( C4::Bookseller::GetBooksellersWithLateOrders( -1, undef, undef ),
+#    undef, "-1 is a wrong value for a delay" );
+
+#Case 4: With $delay = 0
+#    today  == now-0 -LATE- (if no deliverytime or deliverytime == 0)
+#    today-5   <= now() - $delay+2 -LATE-
+#    today-10  <= now() - $delay+3 -LATE-
+#    quantityreceived = quantity -NOT LATE-
+%suppliers = C4::Bookseller::GetBooksellersWithLateOrders( 0, undef, undef );
+
+ok( exists( $suppliers{$id_supplier1} ),
+    "Supplier1 has late orders but $today == now() - 0 days" )
+  ;
+ok( exists( $suppliers{$id_supplier2} ),
+    "Supplier2 has late orders and $daysago5 <= now() - 2" );
+ok( exists( $suppliers{$id_supplier3} ),
+    "Supplier3 has late orders and $daysago10 <= now() - 3" );
+isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
+
+#Case 5 : With $estimateddeliverydatefrom = today-4
+#    today >= today-4 -NOT LATE-
+#    (today-5)+ 2 days >= today-4  -LATE-
+#    (today-10) + 3 days < today-4   -NOT LATE-
+#    quantityreceived = quantity -NOT LATE-
+my $dt_today3 = dt_from_string;
+my $dur4 = DateTime::Duration->new( days => -4 );
+$dt_today3->add_duration($dur4);
+my $daysago4 = output_pref( $dt_today3, 'iso', '24hr', 1 );
+%suppliers =
+  C4::Bookseller::GetBooksellersWithLateOrders( undef, $daysago4, undef );
+
+#FIXME: if the deliverytime is undef, it doesn't consider the supplier
+#ok( exists( $suppliers{$id_supplier1} ),
+#    "Supplier1 has late orders and $today >= $daysago4 -deliverytime undef" );
+ok( exists( $suppliers{$id_supplier2} ),
+    "Supplier2 has late orders and $daysago5 + 2 days >= $daysago4 " );
+isnt( exists( $suppliers{$id_supplier3} ),
+    1, "Supplier3 has late orders and $daysago10 + 5 days < $daysago4 " );
+isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
+
+#Case 6: With $estimateddeliverydatefrom =today-10 and $estimateddeliverydateto = today - 5
+#    $daysago10<$daysago5<today -NOT LATE-
+#    $daysago10<$daysago5<$daysago5 +2 -NOT lATE-
+#    $daysago10<$daysago10 +3 <$daysago5 -LATE-
+#    quantityreceived = quantity -NOT LATE-
+%suppliers = C4::Bookseller::GetBooksellersWithLateOrders( undef, $daysago10,
+    $daysago5 );
+isnt( exists( $suppliers{$id_supplier1} ),
+    1, "Supplier1 has late orders but $daysago10 < $daysago5 < $today" );
+isnt(
+    exists( $suppliers{$id_supplier2} ),
+    1,
+    "Supplier2 has late orders but $daysago10 < $daysago5 < $daysago5+2"
+);
+ok(
+    exists( $suppliers{$id_supplier3} ),
+"Supplier3 has late orders and $daysago10 <= $daysago10 +3 <= $daysago5"
+);
+isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
+
+#Case 7: With $estimateddeliverydateto = today-5
+#    $today >= $daysago5  -NOT LATE-
+#    $daysago5 + 2 days  > $daysago5 -NOT LATE-
+#    $daysago10 + 3  <+ $daysago5  -LATE-
+#    quantityreceived = quantity -NOT LATE-
+%suppliers =
+  C4::Bookseller::GetBooksellersWithLateOrders( undef, undef, $daysago5 );
+#FIXME: if only the estimateddeliverydatefrom is given, it doesn't consider the parameters,
+#but it replaces it today's date
+#isnt( exists( $suppliers{$id_supplier1} ),
+#    1,
+#    "Supplier1 has late orders but $today >= $daysago5 - deliverytime undef" );
+#isnt( exists( $suppliers{$id_supplier2} ),
+#    1, "Supplier2 has late orders but  $daysago5 + 2 days  > $daysago5 " );
+ok( exists( $suppliers{$id_supplier3} ),
+    "Supplier3 has late orders and $daysago10 + 3  <= $daysago5" );
+isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
+
+#Test with $estimateddeliverydatefrom and  $estimateddeliverydateto and $delay
+#Case 8 :With $estimateddeliverydatefrom = 2013-07-05 and  $estimateddeliverydateto = 2013-07-08 and $delay =5
+#    $daysago4<today<=$today and $today<now()-3  -NOT LATE-
+#    $daysago4 < $daysago5 + 2days <= today and $daysago5 <= now()-3+2 days -LATE-
+#    $daysago4 > $daysago10 + 3days < today and $daysago10 <= now()-3+3 days -NOT LATE-
+#    quantityreceived = quantity -NOT LATE-
+%suppliers =
+  C4::Bookseller::GetBooksellersWithLateOrders( 3, $daysago4, $today );
+isnt(
+    exists( $suppliers{$id_supplier1} ),
+    1,
+    "Supplier1 has late orders but $daysago4<today<=$today and $today<now()-3"
+);
+ok(
+    exists( $suppliers{$id_supplier2} ),
+"Supplier2 has late orders and $daysago4 < $daysago5 + 2days <= today and $daysago5 <= now()-3+2 days"
+);
+isnt(
+    exists( $suppliers{$id_supplier3} ),
+"Supplier3 has late orders but $daysago4 > $daysago10 + 3days < today and $daysago10 <= now()-3+3 days"
+);
+isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
+
+#Case 9 :With $estimateddeliverydatefrom = $daysago5  and $delay = 3
+#   $today < $daysago5 and $today > $today-5 -NOT LATE-
+#   $daysago5 + 2 days >= $daysago5  and $daysago5 < today - 3+2 -LATE-
+#   $daysago10 + 3 days < $daysago5 and $daysago10 < today -3+2-NOT LATE-
+#   quantityreceived = quantity -NOT LATE-
+%suppliers =
+  C4::Bookseller::GetBooksellersWithLateOrders( 3, $daysago5, undef );
+isnt( exists( $suppliers{$id_supplier1} ),
+    1, "$today < $daysago10 and $today > $today-3" );
+ok(
+    exists( $suppliers{$id_supplier2} ),
+"Supplier2 has late orders and $daysago5 + 2 days >= $daysago5  and $daysago5 < today - 3+2"
+);
+isnt(
+    exists( $suppliers{$id_supplier3} ),
+    1,
+"Supplier2 has late orders but $daysago10 + 3 days < $daysago5 and $daysago10 < today -3+2 "
+);
+isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
+
+#Test with $estimateddeliverydateto  and $delay
+#Case 10:With $estimateddeliverydateto = $daysago5 and $delay = 5
+#    today > $daysago5 today > now() -5 -NOT LATE-
+#    $daysago5 + 2 days > $daysago5  and $daysago5 > now() - 2+5 days -NOT LATE-
+#    $daysago10 + 3 days <= $daysago5 and $daysago10 <= now() - 3+5 days -LATE-
+#    quantityreceived = quantity -NOT LATE-
+%suppliers =
+  C4::Bookseller::GetBooksellersWithLateOrders( 5, undef, $daysago5 );
+isnt( exists( $suppliers{$id_supplier1} ),
+    1, "Supplier2 has late orders but today > $daysago5 today > now() -5" );
+#FIXME: GetBookSellersWithLateOrders replace estimateddeliverydateto by
+#today's date when no estimateddeliverydatefrom is give
+#isnt(
+#    exists( $suppliers{$id_supplier2} ),
+#    1,
+#"Supplier2 has late orders but $daysago5 + 2 days > $daysago5  and $daysago5 > now() - 2+5 days"
+#);
+ok(
+    exists( $suppliers{$id_supplier3} ),
+"Supplier2 has late orders and $daysago10 + 3 days <= $daysago5 and $daysago10 <= now() - 3+5 days "
+);
+isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
+
+#Case 11: With $estimateddeliverydatefrom =today-10 and $estimateddeliverydateto = today - 10
+#    $daysago10==$daysago10==$daysago10 -NOT LATE-
+#    $daysago10==$daysago10<$daysago5+2-NOT lATE-
+#    $daysago10==$daysago10 <$daysago10+3-LATE-
+#    quantityreceived = quantity -NOT LATE-
+
+#Basket1 closedate -> $daysago10
+$basket1info = {
+    basketno  => $sample_basket1,
+    closedate => $daysago10,
+};
+ModBasket($basket1info);
+%suppliers = C4::Bookseller::GetBooksellersWithLateOrders( undef, $daysago10,
+    $daysago10 );
+#FIXME :GetBookSellers doesn't take care if the closedate is ==$estimateddeliverydateto
+# ok( exists( $suppliers{$id_supplier1} ),
+#    "Supplier1 has late orders and $daysago10==$daysago10==$daysago10 " )
+#  ;
+isnt( exists( $suppliers{$id_supplier2} ),
+    1,
+    "Supplier2 has late orders but $daysago10==$daysago10<$daysago5+2" );
+isnt( exists( $suppliers{$id_supplier3} ),
+    1,
+    "Supplier3 has late orders but $daysago10==$daysago10 <$daysago10+3" );
+isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
+
+#Case 12: closedate == $estimateddeliverydatefrom =today-10
+%suppliers =
+  C4::Bookseller::GetBooksellersWithLateOrders( undef, $daysago10, undef );
+#FIXME :GetBookSellers doesn't take care if the closedate is ==$estimateddeliverydateto
+#ok( exists( $suppliers{$id_supplier1} ),
+#    "Supplier1 has late orders and $daysago10==$daysago10 " );
+
+#Case 13: closedate == $estimateddeliverydateto =today-10
+%suppliers =
+  C4::Bookseller::GetBooksellersWithLateOrders( undef, undef, $daysago10 );
+ok( exists( $suppliers{$id_supplier1} ),
+    "Supplier1 has late orders and $daysago10==$daysago10 " )
+  ;
+
+#End transaction
+$dbh->rollback;
+
+#field_filter filters the useless fields or foreign keys
+#NOTE: all the fields of aqbookseller arent considered
+#returns a cleaned structure
+sub field_filter {
+    my ($struct) = @_;
+
+    for my $field (
+        'bookselleremail', 'booksellerfax',
+        'booksellerurl',   'othersupplier',
+        'currency',        'invoiceprice',
+        'listprice'
+      )
+    {
+
+        if ( grep { /^$field$/ } keys %$struct ) {
+            delete $struct->{$field};
+        }
+    }
+    return $struct;
+}
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Fri Jul 26 02:06:30 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Fri, 26 Jul 2013 12:06:30 +1200
Subject: [Koha-patches] [PATCH] Bug 10589 - Override OpacHiddenItems based
	on Patron Category
Message-ID: <1374797190-12052-1-git-send-email-srdjan@catalyst.net.nz>

From: Mark Tompsett <mtompset at hotmail.com>

Two system preferences, PatronSingleBranch and
PatronEveryBranch, have been added to facilitate some
granularity on the override.

If the home branch of the item and the patron match and the
catgegory code of the patron matches one of the pipe delimited
values in the PatronSingleBranch patron category code, then
an item which would normally be hidden will be visible.

If the patron category matches one of the pipe delimited
values in the PatronEveryBranch patron category, then every
item hidden by OpacHiddenItems will be visible.

Since the patron category codes used by default for these
two system preferences are not added, OpacHiddenItems will
continue function as expected until individual patrons and
system preferences are configured.

There is no need to provide this functionality to staff,
as they have access to the staff client.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Items.pm                                        | 25 ++++++++++++++++++++--
 installer/data/mysql/sysprefs.sql                  |  2 ++
 installer/data/mysql/updatedatabase.pl             | 16 ++++++++++++++
 .../prog/en/modules/admin/preferences/opac.pref    |  8 +++++++
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/C4/Items.pm b/C4/Items.pm
index 212a9d3..f7550dc 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -32,6 +32,7 @@ use C4::Log;
 use List::MoreUtils qw/any/;
 use Data::Dumper; # used as part of logging item record changes, not just for
                   # debugging; so please don't remove this
+use C4::Members qw/GetBorrowerCategorycode/;
 
 use vars qw($VERSION @ISA @EXPORT);
 
@@ -1635,6 +1636,18 @@ sub GetHiddenItemnumbers {
         return ();
     }
     my $dbh = C4::Context->dbh;
+    my $borrowernumber = 0;
+    my $homebranch = q{};
+    my $categorycode = q{};
+    if (C4::Context->userenv) {
+        $borrowernumber = C4::Context->userenv->{'number'} || 0;
+        $homebranch = C4::Context->userenv->{'branch'} || q{};
+    }
+    if ($borrowernumber) {
+        $categorycode = C4::Members::GetBorrowerCategorycode($borrowernumber) || q{};
+    }
+    my @SingleBranchCodes = split /\|/,C4::Context->preference('PatronSingleBranch');
+    my @EveryBranchCodes = split /\|/,C4::Context->preference('PatronEveryBranch');
 
     # For each item
     foreach my $item (@items) {
@@ -1654,8 +1667,16 @@ sub GetHiddenItemnumbers {
             # If the results matches the values in the yaml file
             if (any { $val eq $_ } @{$hidingrules->{$field}}) {
 
-                # We add the itemnumber to the list
-                push @resultitems, $item->{'itemnumber'};
+                my $override = 0;
+                if ( ($homebranch eq $item->{'homebranch'} &&
+                      (any { /^$categorycode$/ } @SingleBranchCodes ) ) ||
+                     (any { /^$categorycode$/ } @EveryBranchCodes ) ) {
+                    $override = 1;
+                }
+                if ($override==0) {
+                    # We add the itemnumber to the hidden list
+                    push @resultitems, $item->{'itemnumber'};
+                }
 
                 # If at least one rule matched for an item, no need to test the others
                 last;
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index c8caee7..accb0b9 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -430,3 +430,5 @@ INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) V
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CalculateFinesOnReturn','1','Switch to control if overdue fines are calculated on return or not', '', 'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AcqWarnOnDuplicateInvoice','0','Warn librarians when they try to create a duplicate invoice', '', 'YesNo');
 INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowTooManyOverride', '1', 'If on, allow staff to override and check out items when the patron has reached the maximum number of allowed checkouts', '', 'YesNo');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('PatronEveryBranch','','Pipe delimited patron category codes which allow viewing hidden items for every branch','','');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('PatronSingleBranch','',"Pipe delimited patron category codes which allow viewing hidden items for only the patron's home branch",'','');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 74aeb3e..ab69e81 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -7067,6 +7067,22 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.13.00.XXX";
+if ( CheckVersion($DBversion) ) {
+    $dbh->do(
+        q{
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('PatronEveryBranch','',"Pipe delimited patron category codes which allow viewing hidden items for every branch",'','');
+}
+    );
+    $dbh->do(
+        q{
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('PatronSingleBranch','',"Pipe delimited patron category codes which allow viewing hidden items for only the patron's home branch",'','');
+}
+    );
+    print "Upgrade to $DBversion done (Bug filtering: Patron Category to override OPACHiddenItems)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 90295ef..2f4c195 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -497,6 +497,14 @@ OPAC:
               class: code
             - Allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations
         -
+            - pref: PatronSingleBranch
+              class: short
+            - Patrons matching one of these pipe delimited patron category codes override OpacHiddenItems for their home branch only.
+        -
+            - pref: PatronEveryBranch
+              class: short
+            - Patrons matching one of these pipe delimited patron category codes override OpacHiddenItems for every branch.
+        -
             - pref: OpacAllowPublicListCreation
               default: 1
               choices:
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Fri Jul 26 06:06:02 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Fri, 26 Jul 2013 16:06:02 +1200
Subject: [Koha-patches] [PATCH] Bug 10424 - Search received orders
Message-ID: <1374811562-6318-1-git-send-email-srdjan@catalyst.net.nz>

From: Amit Gupta <amitddng135 at gmail.com>

Search against order numbers and pull up the related
invoice to see when the item was received.

This allows users to see details of received orders,
including the details against which invoice the order is
received.

Test Plan:
1) Create a basket.
2) Create a orders under basket and close the basket.
3) Click on Receive shipment button and enter the invoice no and
shipment date.
4) Click on Receive link to receive the items.
5) Click on Received orders link on the left hand side.
6) This allow user to search by orderline, basket, title, author,
ISBN, vendor and date received.
7) Users will be able to see details of received orders.

Sponsored-by: Staffordshire University/Halton Borough Council/PTFS Europe

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Acquisition.pm                                  | 139 +++++++++++++++++++++
 acqui/receivedorders.pl                            | 109 ++++++++++++++++
 .../prog/en/includes/acquisitions-menu.inc         |   1 +
 .../prog/en/modules/acqui/receivedorders.tt        | 110 ++++++++++++++++
 4 files changed, 359 insertions(+)
 create mode 100755 acqui/receivedorders.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/receivedorders.tt

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 1a210b5..c8bc7d4 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -72,6 +72,7 @@ BEGIN {
         &CloseInvoice
         &ReopenInvoice
         &DelInvoice
+        &GetReceivedorder
 
         &GetItemnumbersFromOrder
 
@@ -2061,6 +2062,144 @@ sub GetHistory {
     return \@order_loop, $total_qty, $total_price, $total_qtyreceived;
 }
 
+=head3 GetReceivedorder
+
+    $orderrec_loop = GetReceivedorder( %params );
+
+Returns an arrayref of received orders
+
+params:
+    title
+    author
+    name
+    datereceivedfrom
+    datereceivedto
+    basket                  - search both basket name and number
+    ordernumber             - search by ordernumber
+
+returns:
+    $order_loop is a reference to an array of hashrefs that each look like this:
+            {
+                'author'           => 'Twain, Mark',
+                'basketno'         => '1',
+                'biblionumber'     => '215',
+                'datereceived'     => 'MM/DD/YYYY'
+                'name'             => '',
+                'ordernumber'      => '1',
+                'quantity'         => 1,
+                'quantityreceived' => undef,
+                'title'            => 'The Adventures of Huckleberry Finn'
+            }
+
+=cut
+
+sub GetReceivedorder {
+    croak "No search params" unless @_;
+    my %params = @_;
+    my $title = $params{title};
+    my $author = $params{author};
+    my $isbn   = $params{isbn};
+    my $ean    = $params{ean};
+    my $name = $params{name};
+    my $datereceivedfrom = $params{datereceivedfrom};
+    my $datereceivedto = $params{datereceivedto};
+    my $basket = $params{basket};
+    my $order = $params{ordernumber};
+
+    my $query ="
+        SELECT
+            biblio.title,
+            biblio.author,
+            biblioitems.isbn,
+            biblioitems.ean,
+            aqorders.basketno,
+            aqbasket.basketname,
+            aqbooksellers.name,
+            aqbasket.creationdate,
+            aqorders.datereceived,
+            aqorders.quantity,
+            aqorders.quantityreceived,
+            aqorders.ecost,
+            aqorders.ordernumber,
+            aqorders.invoiceid,
+            aqinvoices.invoicenumber,
+            aqbooksellers.id as id,
+            aqorders.biblionumber
+        FROM aqorders
+        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
+        LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
+        LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber
+        LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber
+        LEFT JOIN aqinvoices ON aqorders.invoiceid = aqinvoices.invoiceid";
+
+    $query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber"
+    if ( C4::Context->preference("IndependentBranches") );
+
+    $query .= " WHERE (aqorders.datereceived IS NOT NULL) ";
+
+    my @query_params  = ();
+
+    if ( $title ) {
+        $query .= " AND biblio.title LIKE ? ";
+        $title =~ s/\s+/%/g;
+        push @query_params, "%$title%";
+    }
+
+    if ( $author ) {
+        $query .= " AND biblio.author LIKE ? ";
+        push @query_params, "%$author%";
+    }
+
+    if ( $isbn ) {
+        $query .= " AND biblioitems.isbn LIKE ? ";
+        push @query_params, "%$isbn%";
+    }
+    if ( defined $ean and $ean ) {
+        $query .= " AND biblioitems.ean = ? ";
+        push @query_params, "$ean";
+    }
+    if ( $name ) {
+        $query .= " AND aqbooksellers.name LIKE ? ";
+        push @query_params, "%$name%";
+    }
+    if ( $datereceivedfrom ) {
+        $query .= " AND aqorders.datereceived >= ? ";
+        push @query_params, $datereceivedfrom;
+    }
+
+    if ( $datereceivedto ) {
+        $query .= " AND aqorders.datereceived <= ? ";
+        push @query_params, $datereceivedto;
+    }
+
+    if ($basket) {
+        if ($basket =~ m/^\d+$/) {
+            $query .= " AND aqorders.basketno = ? ";
+            push @query_params, $basket;
+        } else {
+            $query .= " AND aqbasket.basketname LIKE ? ";
+            push @query_params, "%$basket%";
+        }
+    }
+
+    if ($order =~ m/^\d+$/) {
+            $query .= " AND aqorders.ordernumber = ? ";
+            push @query_params, $order;
+        }
+
+    if ( C4::Context->preference("IndependentBranches") ) {
+        my $userenv = C4::Context->userenv;
+        if ( $userenv && ($userenv->{flags} || 0) != 1 ) {
+            $query .= " AND (borrowers.branchcode = ? OR borrowers.branchcode ='' ) ";
+            push @query_params, $userenv->{branch};
+        }
+    }
+    $query .= " ORDER BY id";
+
+    my $dbh = C4::Context->dbh;
+    return $dbh->selectall_arrayref( $query, { Slice => {} }, @query_params );
+}
+
 =head2 GetRecentAcqui
 
   $results = GetRecentAcqui($days);
diff --git a/acqui/receivedorders.pl b/acqui/receivedorders.pl
new file mode 100755
index 0000000..c69c3cb
--- /dev/null
+++ b/acqui/receivedorders.pl
@@ -0,0 +1,109 @@
+#!/usr/bin/perl
+
+# This file is part of Koha.
+#
+# Copyright 2013 Amit Gupta(amitddng135 at gmail.com)
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+=head1 NAME
+
+receivedorders.pl
+
+=head1 DESCRIPTION
+
+this script offer a interface to search among order.
+
+=head1 CGI PARAMETERS
+
+=over 4
+
+=item title
+if the script has to filter the results on title.
+
+=item author
+if the script has to filter the results on author.
+
+=item name
+if the script has to filter the results on supplier.
+
+=item datereceivedfrom
+to filter on started date.
+
+=item datereceivedto
+to filter on ended date.
+
+=back
+
+=cut
+
+use strict;
+use warnings;
+use CGI;
+use C4::Auth;    # get_template_and_user
+use C4::Output;
+use C4::Acquisition qw/GetReceivedorder/;
+use C4::Dates;
+use C4::Debug;
+
+my $input = new CGI();
+my $title                   = $input->param('title');
+my $ordernumber             = $input->param('ordernumber');
+my $author                  = $input->param('author');
+my $isbn                    = $input->param('isbn');
+my $name                    = $input->param('name' );
+my $ean                     = $input->param('ean');
+my $basket                  = $input->param( 'basket' );
+my $do_search               = $input->param('do_search') || 0;
+my $from                    = C4::Dates->new($input->param('from'));
+my $to                      = C4::Dates->new($input->param('to'));
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "acqui/receivedorders.tmpl",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { acquisition => '*' },
+        debug           => 1,
+    }
+);
+
+my ( $from_iso, $to_iso, $d );
+if ( $d = $input->param('from') ) {
+    $from_iso = C4::Dates->new($d)->output('iso');
+}
+if ( $d = $input->param('iso') ) {
+    $to_iso = C4::Dates->new($d)->output('iso');
+}
+
+my $orderrec_loop;
+
+if ($do_search) {
+    $orderrec_loop = GetReceivedorder(
+        title => $title,
+        author => $author,
+        isbn   => $isbn,
+        ean   => $ean,
+        name => $name,
+        datereceivedfrom => $from_iso,
+        datereceivedto => $to_iso,
+        basket => $basket,
+        ordernumber => $ordernumber,
+    );
+}
+
+$template->param( orderrec_loop => $orderrec_loop,);
+
+output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
index 439118d..d37c4b6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
@@ -2,6 +2,7 @@
 	<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
 	[% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% ELSE %][% END %]
     <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
+    <li><a href="/cgi-bin/koha/acqui/receivedorders.pl">Received orders</a></li>
     [% IF ( CAN_user_acquisition_budget_manage ) %]
     <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
     <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/receivedorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/receivedorders.tt
new file mode 100644
index 0000000..185c6c1
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/receivedorders.tt
@@ -0,0 +1,110 @@
+[% USE KohaDates %]
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( orderrec_loop ) %] Received orders &rsaquo; Search results[% ELSE %]Search received orders[% END %]</title>
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+[% INCLUDE 'doc-head-close.inc' %]
+[% INCLUDE 'calendar.inc' %]
+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+[% INCLUDE 'datatables-strings.inc' %]
+<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+    var orderrecsearch = $("#orderrecsearch").dataTable($.extend(true, {}, dataTablesDefaults, {
+    "sPaginationType": "four_button"
+    } ) );
+});
+</script>
+</head>
+<body id="acq_recsearch" class="acq">
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'acquisitions-search.inc' %]
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; [% IF ( orderrec_loop ) %]<a href="/cgi-bin/koha/acqui/receivedorders.pl">Search received orders</a> &rsaquo; Search results[% ELSE %]Search received orders[% END %]</div>
+
+<div id="doc3" class="yui-t2">
+<div id="bd">
+<div id="yui-main">
+<div class="yui-b">
+    [% UNLESS ( orderrec_loop ) %]<form action="/cgi-bin/koha/acqui/receivedorders.pl" method="post">
+        <fieldset class="rows">
+        <legend>Search received orders</legend>
+        <ol>
+            <li><label for="ordernumber">Order: </label> <input type="text" name="ordernumber" id="ordernumber" value="[% ordernumber %]" /></li>
+            <li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% basket %]" /></li>
+            <li><label for="title">Title: </label> <input type="text" name="title" id="title" value="[% title %]" /></li>
+            <li><label for="author">Author: </label> <input type="text" name="author" id="author" value="[% author %]" /></li>
+            <li><label for="isbn">ISBN: </label> <input type="text" name="isbn" id="isbn" value="[% isbn %]" /></li>
+            [% IF (UNIMARC) %]
+                <li><label for="ean">EAN: </label> <input type="text" name="ean" id="ean" value="[% ean %]" /></li>
+            [% END %]
+            <li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% name %]" /></li>
+            <li><label for="from">Received from: </label>
+            <input type="text" size="10" id="from" name="from" value="[% from_placed_on %]" class="datepickerfrom" />
+                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+            </li>
+            <li><label for="to">Receive to: </label>
+            <input type="text" size="10" id="to" name="to" value="[% to_placed_on %]" class="datepickerto" />
+                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+            </li>
+        </ol>
+        </fieldset>
+        <input type="hidden" name="do_search" value="1" />
+        <fieldset class="action"><input type="submit" value="Search" /></fieldset>
+        </form>
+    [% END %]
+    [% IF ( orderrec_loop ) %]<h1>Received orders search result</h1>
+        <div id="acqui_recsearch">
+        <table id="orderrecsearch">
+        <thead>
+        <tr>
+            <th>Basket</th>
+            <th>Invoice number</th>
+            <th>Order number</th>
+            <th>Summary</th>
+            <th>Vendor</th>
+            <th>Placed on</th>
+            <th>Received on</th>
+            <th>Quantity ordered</th>
+            <th>Quantity received</th>
+            <th>Unit price</th>
+        </tr>
+        </thead>
+        <tbody>
+        [% FOREACH ordersrec_loo IN orderrec_loop %]
+        <tr>
+            <td>[% ordersrec_loo.basketname %] (<a href="basket.pl?basketno=[% ordersrec_loo.basketno %]">[% ordersrec_loo.basketno %]</a>)</td>
+            <td>
+                [% IF  ordersrec_loo.invoicenumber  %]
+                    <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% ordersrec_loo.invoiceid %]">[% ordersrec_loo.invoicenumber %]</a>
+                [% ELSE %]
+                    &nbsp;
+                [% END %]
+            </td>
+            <td>[% ordersrec_loo.ordernumber %]</td>
+            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersrec_loo.biblionumber %]">[% ordersrec_loo.title |html %]</a>
+                <br />[% ordersrec_loo.author %] <br /> [% ordersrec_loo.isbn %]
+            </td>
+            <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% ordersrec_loo.id %]">[% ordersrec_loo.name %]</a></td>
+            <td>[% ordersrec_loo.creationdate | $KohaDates %]</td>
+            <td>
+                [% IF ordersrec_loo.datereceived %]
+                    [% ordersrec_loo.datereceived | $KohaDates %]
+                [% END %]
+            </td>
+            <td>[% ordersrec_loo.quantity %]</td>
+            <td>[% ordersrec_loo.quantityreceived %]</td>
+            <td>[% ordersrec_loo.ecost %]</td>
+        </tr>
+        [% END %]
+        </tbody>
+        </table>
+        </div>
+        [% ELSE %]
+        [% END %]
+</div>
+</div>
+<div class="yui-b">
+[% INCLUDE 'acquisitions-menu.inc' %]
+</div>
+</div>
+[% INCLUDE 'intranet-bottom.inc' %]
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Fri Jul 26 06:13:39 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Fri, 26 Jul 2013 16:13:39 +1200
Subject: [Koha-patches] [PATCH] Bug 10393 - Receive shipment link in
	acquisitions main page
Message-ID: <1374812019-7276-1-git-send-email-srdjan@catalyst.net.nz>

From: Amit Gupta <amitddng135 at gmail.com>

To add some shortcuts to acquisitions main screen e.g.
RECEIVE SHIPMENT and the FILTER BOX

Test plan:
1) Click on Receive shipment link on the left hand side.
2) It will give all the vendor list click on
recieve shipment link to receive items.
3) For creating new basket click on "New Basket" link.

Sponsored-by: Staffordshire University/Halton Borough Council/PTFS Europe

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 acqui/receiveshipment.pl                           | 57 +++++++++++++++++
 .../prog/en/includes/acquisitions-menu.inc         |  1 +
 .../prog/en/modules/acqui/receiveshipment.tt       | 71 ++++++++++++++++++++++
 3 files changed, 129 insertions(+)
 create mode 100755 acqui/receiveshipment.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/receiveshipment.tt

diff --git a/acqui/receiveshipment.pl b/acqui/receiveshipment.pl
new file mode 100755
index 0000000..b24adf9
--- /dev/null
+++ b/acqui/receiveshipment.pl
@@ -0,0 +1,57 @@
+#!/usr/bin/perl
+
+# Copyright 2013 Amit Gupta(amitddng135 at gmail.com)
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+=head1 NAME
+
+receiveshipment.pl
+
+=head1 DESCRIPTION
+
+this script is the main page for acqui
+
+=cut
+
+use strict;
+use warnings;
+use CGI;
+use C4::Auth;
+use C4::Output;
+use C4::Members;
+use C4::Branch;
+use C4::Debug;
+use C4::Bookseller qw/ GetBookSeller /;
+
+my $input = CGI->new();
+
+my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
+    {   template_name   => 'acqui/receiveshipment.tmpl',
+        query           => $input,
+        type            => 'intranet',
+        authnotrequired => 0,
+        flagsrequired   => { acquisition => '*' },
+        debug           => 1,
+    }
+);
+
+my $user = GetMember( 'borrowernumber' => $loggedinuser );
+my $branchname = GetBranchName($user->{branchcode});
+
+my @suppliers = GetBookSeller();
+$template->param( supplier_loop => \@suppliers);
+
+output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
index 439118d..9657466 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
@@ -2,6 +2,7 @@
 	<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
 	[% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% ELSE %][% END %]
     <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
+    <li><a href="/cgi-bin/koha/acqui/receiveshipment.pl">Receive shipment</a></li>
     [% IF ( CAN_user_acquisition_budget_manage ) %]
     <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
     <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/receiveshipment.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/receiveshipment.tt
new file mode 100644
index 0000000..b1004a3
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/receiveshipment.tt
@@ -0,0 +1,71 @@
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Acquisitions &rsaquo; Receive shipment</title>
+[% INCLUDE 'doc-head-close.inc' %]
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+[% INCLUDE 'datatables-strings.inc' %]
+<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+<script type="text/javascript">
+//<![CDATA[
+    $(document).ready(function() {
+        $("#recshipment").dataTable($.extend(true, {}, dataTablesDefaults, {
+            "aoColumnDefs": [
+                { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
+            ],
+            "aaSorting": [[ 1, "asc" ]],
+            "iDisplayLength": 10,
+            "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
+        }));
+    });
+//]]>
+</script>
+</head>
+
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'acquisitions-search.inc' %]
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; </div>
+<div id="doc3" class="yui-t2">
+<div id="bd">
+<div id="yui-main">
+<div class="yui-b">
+<div class="yui-g">
+<div id="acqui_recshipment">
+[% IF (supplier_loop) %]
+<h1>Receive shipment</h1>
+<div id="acqui_recshipment">
+        <table id="recshipment">
+            <thead>
+                <tr>
+		    <th>Vendor</th>
+		    <th>Status</th>
+		    <th>&nbsp;</th>
+                    <th>&nbsp;</th>
+		</tr>
+            </thead>
+<tbody>
+[% FOREACH suppliers IN supplier_loop %]
+    <tr>
+        <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% suppliers.id %]">[% suppliers.name %]</td>
+        [% IF(suppliers.active == 1)%]
+            <td>Active</td>
+        [% ELSE %]
+            <td>Inactive</td>
+        [% END %]
+        <td><a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% suppliers.id %]">Receive shipment</a></td>
+        <td><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% suppliers.id %]&amp;op=add_form">New basket</a></td>
+    </tr>
+[% END %]
+</tbody>
+</table>
+</div>
+[% END %]
+</div>
+</div>
+</div>
+</div>
+<div class="yui-b">
+[% INCLUDE 'acquisitions-menu.inc' %]
+</div>
+</div>
+[% INCLUDE 'intranet-bottom.inc' %]
-- 
1.8.1.2

From oleonard at myacpl.org  Fri Jul 26 17:20:53 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 26 Jul 2013 11:20:53 -0400
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_10649_-_Upgrade_DataTabl?=
	=?utf-8?q?es_and_move_scripts_out_of_theme_directory?=
Message-ID: <1374852054-24445-1-git-send-email-oleonard@myacpl.org>

This patch adds an upgraded copy of the DataTables plugin to the jQuery
plugin directory outside the theme directories. Copies of the old
DataTables plugin scripts have been left in the old location while
templates are incrementally updated.

To test, visit each affected page in Acquisitions and confirm that table
sorting still words correctly:

- Acquisitions home
- Acquisitions -> Late orders
- Acquisitions -> Order search
- Acquisitions -> Ordered (from table of available funds)
- Acquisitions -> Spent (from table of available funds)
- Acquisitions -> Vendor search
- Acquisitions -> Vendor detail
- Acquisitions -> Vendor -> Basket
- Acquisitions -> Vendor -> Basket -> Add order from existing record
                                   -> Add order from suggestion
                                   -> Add order from subscription
                                   -> Add order from external source
                                   -> Add order from staged file
- Acquisitions -> Vendor -> Basket groups
- Acquisitions -> Vendor -> Uncertain prices
- Acquisitions -> Vendor -> Invoices
- Acquisitions -> Vendor -> Invoices -> Invoice
- Acquisitions -> Vendor -> Receive shipments
- Acquisitions -> Vendor -> Receive shipments -> Receipt summary (click
  invoice number)

Also test one or more pages which have not been modified to confirm that
old DataTables assets are still in place and working (ex: Circulation,
Quotes editor, Saved reports, etc.)
---
 .../lib/jquery/plugins/dataTables.fnReloadAjax.js  |   50 ++
 .../plugins/jquery.dataTables.columnFilter.js      |  762 ++++++++++++++++++++
 .../lib/jquery/plugins/jquery.dataTables.min.js    |  155 ++++
 .../intranet-tmpl/prog/en/includes/datatables.inc  |   20 +
 .../prog/en/modules/acqui/acqui-home.tt            |    4 +-
 .../prog/en/modules/acqui/addorderiso2709.tt       |    4 +-
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |    5 +-
 .../prog/en/modules/acqui/basketgroup.tt           |    3 +-
 .../prog/en/modules/acqui/booksellers.tt           |    4 +-
 .../prog/en/modules/acqui/histsearch.tt            |    4 +-
 .../intranet-tmpl/prog/en/modules/acqui/invoice.tt |    4 +-
 .../prog/en/modules/acqui/invoices.tt              |    4 +-
 .../prog/en/modules/acqui/lateorders.tt            |    5 +-
 .../prog/en/modules/acqui/neworderbiblio.tt        |    4 +-
 .../prog/en/modules/acqui/newordersubscription.tt  |    4 +-
 .../prog/en/modules/acqui/newordersuggestion.tt    |    4 +-
 .../intranet-tmpl/prog/en/modules/acqui/ordered.tt |    4 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |    4 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcels.tt |    4 +-
 .../intranet-tmpl/prog/en/modules/acqui/spent.tt   |    4 +-
 .../prog/en/modules/acqui/supplier.tt              |    4 +-
 .../prog/en/modules/acqui/uncertainprice.tt        |    4 +-
 .../prog/en/modules/acqui/z3950_search.tt          |    4 +-
 23 files changed, 1006 insertions(+), 58 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/dataTables.fnReloadAjax.js
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.columnFilter.js
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.min.js
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc

diff --git a/koha-tmpl/intranet-tmpl/lib/jquery/plugins/dataTables.fnReloadAjax.js b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/dataTables.fnReloadAjax.js
new file mode 100644
index 0000000..0eac52a
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/dataTables.fnReloadAjax.js
@@ -0,0 +1,50 @@
+$.fn.dataTableExt.oApi.fnReloadAjax = function ( oSettings, sNewSource, fnCallback, bStandingRedraw )
+{
+    if ( typeof sNewSource != 'undefined' && sNewSource != null )
+    {
+        oSettings.sAjaxSource = sNewSource;
+    }
+    this.oApi._fnProcessingDisplay( oSettings, true );
+    var that = this;
+    var iStart = oSettings._iDisplayStart;
+    var aData = [];
+
+    this.oApi._fnServerParams( oSettings, aData );
+
+    oSettings.fnServerData( oSettings.sAjaxSource, aData, function(json) {
+        /* Clear the old information from the table */
+        that.oApi._fnClearTable( oSettings );
+
+        /* Got the data - add it to the table */
+        var aData =  (oSettings.sAjaxDataProp !== "") ?
+            that.oApi._fnGetObjectDataFn( oSettings.sAjaxDataProp )( json ) : json;
+
+        for ( var i=0 ; i<aData.length ; i++ )
+        {
+            that.oApi._fnAddData( oSettings, aData[i] );
+        }
+
+        oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+        that.fnDraw();
+
+        if ( typeof bStandingRedraw != 'undefined' && bStandingRedraw === true )
+        {
+            oSettings._iDisplayStart = iStart;
+            that.fnDraw( false );
+        }
+
+        that.oApi._fnProcessingDisplay( oSettings, false );
+
+        /* Callback user function - for event handlers etc */
+        if ( typeof fnCallback == 'function' && fnCallback != null )
+        {
+            fnCallback( oSettings );
+        }
+    }, oSettings );
+}
+
+/* Example call to load a new file */
+//oTable.fnReloadAjax( 'media/examples_support/json_source2.txt' );
+
+/* Example call to reload from original file */
+//oTable.fnReloadAjax();
diff --git a/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.columnFilter.js b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.columnFilter.js
new file mode 100644
index 0000000..89343f5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.columnFilter.js
@@ -0,0 +1,762 @@
+/*
+* File:        jquery.dataTables.columnFilter.js
+* Version:     1.5.0.
+* Author:      Jovan Popovic
+*
+* Copyright 2011-2012 Jovan Popovic, all rights reserved.
+*
+* This source file is free software, under either the GPL v2 license or a
+* BSD style license, as supplied with this software.
+*
+* This source file is distributed in the hope that it will be useful, but
+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+* or FITNESS FOR A PARTICULAR PURPOSE.
+*
+* Parameters:"
+* @sPlaceHolder                 String      Place where inline filtering function should be placed ("tfoot", "thead:before", "thead:after"). Default is "tfoot"
+* @sRangeSeparator              String      Separator that will be used when range values are sent to the server-side. Default value is "~".
+* @sRangeFormat                 string      Default format of the From ... to ... range inputs. Default is From {from} to {to}
+* @aoColumns                    Array       Array of the filter settings that will be applied on the columns
+*/
+(function ($) {
+
+
+    $.fn.columnFilter = function (options) {
+
+        var asInitVals, i, label, th;
+
+        //var sTableId = "table";
+        var sRangeFormat = "From {from} to {to}";
+        //Array of the functions that will override sSearch_ parameters
+        var afnSearch_ = new Array();
+        var aiCustomSearch_Indexes = new Array();
+
+        var oFunctionTimeout = null;
+
+        var fnOnFiltered = function () { };
+
+        function _fnGetColumnValues(oSettings, iColumn, bUnique, bFiltered, bIgnoreEmpty) {
+            ///<summary>
+            ///Return values in the column
+            ///</summary>
+            ///<param name="oSettings" type="Object">DataTables settings</param>
+            ///<param name="iColumn" type="int">Id of the column</param>
+            ///<param name="bUnique" type="bool">Return only distinct values</param>
+            ///<param name="bFiltered" type="bool">Return values only from the filtered rows</param>
+            ///<param name="bIgnoreEmpty" type="bool">Ignore empty cells</param>
+
+            // check that we have a column id
+            if (typeof iColumn == "undefined") return new Array();
+
+            // by default we only wany unique data
+            if (typeof bUnique == "undefined") bUnique = true;
+
+            // by default we do want to only look at filtered data
+            if (typeof bFiltered == "undefined") bFiltered = true;
+
+            // by default we do not wany to include empty values
+            if (typeof bIgnoreEmpty == "undefined") bIgnoreEmpty = true;
+
+            // list of rows which we're going to loop through
+            var aiRows;
+
+            // use only filtered rows
+            if (bFiltered == true) aiRows = oSettings.aiDisplay;
+            // use all rows
+            else aiRows = oSettings.aiDisplayMaster; // all row numbers
+
+            // set up data array
+            var asResultData = new Array();
+
+            for (var i = 0, c = aiRows.length; i < c; i++) {
+                var iRow = aiRows[i];
+                var aData = oTable.fnGetData(iRow);
+                var sValue = aData[iColumn];
+
+                // ignore empty values?
+                if (bIgnoreEmpty == true && sValue.length == 0) continue;
+
+                // ignore unique values?
+                else if (bUnique == true && jQuery.inArray(sValue, asResultData) > -1) continue;
+
+                // else push the value onto the result data array
+                else asResultData.push(sValue);
+            }
+
+            return asResultData.sort();
+        }
+
+        function _fnColumnIndex(iColumnIndex) {
+            if (properties.bUseColVis)
+                return iColumnIndex;
+            else
+                return oTable.fnSettings().oApi._fnVisibleToColumnIndex(oTable.fnSettings(), iColumnIndex);
+            //return iColumnIndex;
+            //return oTable.fnSettings().oApi._fnColumnIndexToVisible(oTable.fnSettings(), iColumnIndex);
+        }
+
+        function fnCreateInput(oTable, regex, smart, bIsNumber, iFilterLength, iMaxLenght) {
+            var sCSSClass = "text_filter";
+            if (bIsNumber)
+                sCSSClass = "number_filter";
+
+            label = label.replace(/(^\s*)|(\s*$)/g, "");
+            var currentFilter = oTable.fnSettings().aoPreSearchCols[i].sSearch;
+            var search_init = 'search_init ';
+            var inputvalue = label;
+            if (currentFilter != '' && currentFilter != '^') {
+                if (bIsNumber && currentFilter.charAt(0) == '^')
+                    inputvalue = currentFilter.substr(1); //ignore trailing ^
+                else
+                    inputvalue = currentFilter;
+                search_init = '';
+            }
+
+            var input = $('<input type="text" class="' + search_init + sCSSClass + '" value="' + inputvalue + '"/>');
+            if (iMaxLenght != undefined && iMaxLenght != -1) {
+                input.attr('maxlength', iMaxLenght);
+            }
+            th.html(input);
+            if (bIsNumber)
+                th.wrapInner('<span class="filter_column filter_number" />');
+            else
+                th.wrapInner('<span class="filter_column filter_text" />');
+
+            asInitVals[i] = label;
+            var index = i;
+
+            if (bIsNumber && !oTable.fnSettings().oFeatures.bServerSide) {
+                input.keyup(function () {
+                    /* Filter on the column all numbers that starts with the entered value */
+                    oTable.fnFilter('^' + this.value, _fnColumnIndex(index), true, false); //Issue 37
+                    fnOnFiltered();
+                });
+            } else {
+                input.keyup(function () {
+                    if (oTable.fnSettings().oFeatures.bServerSide && iFilterLength != 0) {
+                        //If filter length is set in the server-side processing mode
+                        //Check has the user entered at least iFilterLength new characters
+
+                        var currentFilter = oTable.fnSettings().aoPreSearchCols[index].sSearch;
+                        var iLastFilterLength = $(this).data("dt-iLastFilterLength");
+                        if (typeof iLastFilterLength == "undefined")
+                            iLastFilterLength = 0;
+                        var iCurrentFilterLength = this.value.length;
+                        if (Math.abs(iCurrentFilterLength - iLastFilterLength) < iFilterLength
+                        //&& currentFilter.length == 0 //Why this?
+					        ) {
+                            //Cancel the filtering
+                            return;
+                        }
+                        else {
+                            //Remember the current filter length
+                            $(this).data("dt-iLastFilterLength", iCurrentFilterLength);
+                        }
+                    }
+                    /* Filter on the column (the index) of this element */
+                    oTable.fnFilter(this.value, _fnColumnIndex(index), regex, smart); //Issue 37
+                    fnOnFiltered();
+                });
+            }
+
+            input.focus(function () {
+                if ($(this).hasClass("search_init")) {
+                    $(this).removeClass("search_init");
+                    this.value = "";
+                }
+            });
+            input.blur(function () {
+                if (this.value == "") {
+                    $(this).addClass("search_init");
+                    this.value = asInitVals[index];
+                }
+            });
+        }
+
+        function fnCreateRangeInput(oTable) {
+
+			//var currentFilter = oTable.fnSettings().aoPreSearchCols[i].sSearch;
+            th.html(_fnRangeLabelPart(0));
+            var sFromId = oTable.attr("id") + '_range_from_' + i;
+            var from = $('<input type="text" class="number_range_filter" id="' + sFromId + '" rel="' + i + '"/>');
+            th.append(from);
+            th.append(_fnRangeLabelPart(1));
+            var sToId = oTable.attr("id") + '_range_to_' + i;
+            var to = $('<input type="text" class="number_range_filter" id="' + sToId + '" rel="' + i + '"/>');
+            th.append(to);
+            th.append(_fnRangeLabelPart(2));
+            th.wrapInner('<span class="filter_column filter_number_range" />');
+            var index = i;
+            aiCustomSearch_Indexes.push(i);
+
+
+
+            //------------start range filtering function
+
+
+            /* 	Custom filtering function which will filter data in column four between two values
+            *	Author: 	Allan Jardine, Modified by Jovan Popovic
+            */
+            //$.fn.dataTableExt.afnFiltering.push(
+            oTable.dataTableExt.afnFiltering.push(
+	        function (oSettings, aData, iDataIndex) {
+	            if (oTable.attr("id") != oSettings.sTableId)
+	                return true;
+	            // Try to handle missing nodes more gracefully
+	            if (document.getElementById(sFromId) == null)
+	                return true;
+	            var iMin = document.getElementById(sFromId).value * 1;
+	            var iMax = document.getElementById(sToId).value * 1;
+	            var iValue = aData[_fnColumnIndex(index)] == "-" ? 0 : aData[_fnColumnIndex(index)] * 1;
+	            if (iMin == "" && iMax == "") {
+	                return true;
+	            }
+	            else if (iMin == "" && iValue <= iMax) {
+	                return true;
+	            }
+	            else if (iMin <= iValue && "" == iMax) {
+	                return true;
+	            }
+	            else if (iMin <= iValue && iValue <= iMax) {
+	                return true;
+	            }
+	            return false;
+	        }
+        );
+            //------------end range filtering function
+
+
+
+            $('#' + sFromId + ',#' + sToId, th).keyup(function () {
+
+                var iMin = document.getElementById(sFromId).value * 1;
+                var iMax = document.getElementById(sToId).value * 1;
+                if (iMin != 0 && iMax != 0 && iMin > iMax)
+                    return;
+
+                oTable.fnDraw();
+                fnOnFiltered();
+            });
+
+
+        }
+
+
+        function fnCreateDateRangeInput(oTable) {
+
+            var aoFragments = sRangeFormat.split(/[}{]/);
+
+            th.html("");
+            //th.html(_fnRangeLabelPart(0));
+            var sFromId = oTable.attr("id") + '_range_from_' + i;
+            var from = $('<input type="text" class="date_range_filter" id="' + sFromId + '" rel="' + i + '"/>');
+            from.datepicker();
+            //th.append(from);
+            //th.append(_fnRangeLabelPart(1));
+            var sToId = oTable.attr("id") + '_range_to_' + i;
+            var to = $('<input type="text" class="date_range_filter" id="' + sToId + '" rel="' + i + '"/>');
+            //th.append(to);
+            //th.append(_fnRangeLabelPart(2));
+
+            for (ti = 0; ti < aoFragments.length; ti++) {
+
+                if (aoFragments[ti] == properties.sDateFromToken) {
+                    th.append(from);
+                } else {
+                    if (aoFragments[ti] == properties.sDateToToken) {
+                        th.append(to);
+                    } else {
+                        th.append(aoFragments[ti]);
+                    }
+                }
+
+
+            }
+
+
+            th.wrapInner('<span class="filter_column filter_date_range" />');
+            to.datepicker();
+            var index = i;
+            aiCustomSearch_Indexes.push(i);
+
+
+            //------------start date range filtering function
+
+            //$.fn.dataTableExt.afnFiltering.push(
+            oTable.dataTableExt.afnFiltering.push(
+	        function (oSettings, aData, iDataIndex) {
+	            if (oTable.attr("id") != oSettings.sTableId)
+	                return true;
+
+	            var dStartDate = from.datepicker("getDate");
+
+	            var dEndDate = to.datepicker("getDate");
+
+	            if (dStartDate == null && dEndDate == null) {
+	                return true;
+	            }
+
+	            var dCellDate = null;
+	            try {
+	                if (aData[_fnColumnIndex(index)] == null || aData[_fnColumnIndex(index)] == "")
+	                    return false;
+	                dCellDate = $.datepicker.parseDate($.datepicker.regional[""].dateFormat, aData[_fnColumnIndex(index)]);
+	            } catch (ex) {
+	                return false;
+	            }
+	            if (dCellDate == null)
+	                return false;
+
+
+	            if (dStartDate == null && dCellDate <= dEndDate) {
+	                return true;
+	            }
+	            else if (dStartDate <= dCellDate && dEndDate == null) {
+	                return true;
+	            }
+	            else if (dStartDate <= dCellDate && dCellDate <= dEndDate) {
+	                return true;
+	            }
+	            return false;
+	        }
+        );
+            //------------end date range filtering function
+
+            $('#' + sFromId + ',#' + sToId, th).change(function () {
+                oTable.fnDraw();
+                fnOnFiltered();
+            });
+
+
+        }
+
+        function fnCreateColumnSelect(oTable, aData, iColumn, nTh, sLabel, bRegex, oSelected) {
+            if (aData == null)
+                aData = _fnGetColumnValues(oTable.fnSettings(), iColumn, true, false, true);
+            var index = iColumn;
+            var currentFilter = oTable.fnSettings().aoPreSearchCols[i].sSearch;
+            if (currentFilter == null || currentFilter == "")//Issue 81
+                currentFilter = oSelected;
+
+            var r = '<select class="search_init select_filter"><option value="" class="search_init">' + sLabel + '</option>';
+            var j = 0;
+            var iLen = aData.length;
+            for (j = 0; j < iLen; j++) {
+                if (typeof (aData[j]) != 'object') {
+                    var selected = '';
+                    if (escape(aData[j]) == currentFilter
+                        || escape(aData[j]) == escape(currentFilter)
+                        )
+                        selected = 'selected '
+                    r += '<option ' + selected + ' value="' + escape(aData[j]) + '">' + aData[j] + '</option>';
+                }
+                else {
+                    var selected = '';
+                    if (bRegex) {
+                        //Do not escape values if they are explicitely set to avoid escaping special characters in the regexp
+                        if (aData[j].value == currentFilter) selected = 'selected ';
+                        r += '<option ' + selected + 'value="' + aData[j].value + '">' + aData[j].label + '</option>';
+                    } else {
+                        if (escape(aData[j].value) == currentFilter) selected = 'selected ';
+                        r += '<option ' + selected + 'value="' + escape(aData[j].value) + '">' + aData[j].label + '</option>';
+                    }
+                }
+            }
+
+            var select = $(r + '</select>');
+            nTh.html(select);
+            nTh.wrapInner('<span class="filter_column filter_select" />');
+            select.change(function () {
+                //var val = $(this).val();
+                if ($(this).val() != "") {
+                    $(this).removeClass("search_init");
+                } else {
+                    $(this).addClass("search_init");
+                }
+                if (bRegex)
+                    oTable.fnFilter($(this).val(), iColumn, bRegex); //Issue 41
+                else
+                    oTable.fnFilter(unescape($(this).val()), iColumn); //Issue 25
+                fnOnFiltered();
+            });
+            if (currentFilter != null && currentFilter != "")//Issue 81
+                oTable.fnFilter(unescape(currentFilter), iColumn);
+        }
+
+        function fnCreateSelect(oTable, aData, bRegex, oSelected) {
+            var oSettings = oTable.fnSettings();
+            if (aData == null && oSettings.sAjaxSource != "" && !oSettings.oFeatures.bServerSide) {
+                // Add a function to the draw callback, which will check for the Ajax data having
+                // been loaded. Use a closure for the individual column elements that are used to
+                // built the column filter, since 'i' and 'th' (etc) are locally "global".
+                oSettings.aoDrawCallback.push({
+                    "fn": (function (iColumn, nTh, sLabel) {
+                        return function () {
+                            // Only rebuild the select on the second draw - i.e. when the Ajax
+                            // data has been loaded.
+                            if (oSettings.iDraw == 2 && oSettings.sAjaxSource != null && oSettings.sAjaxSource != "" && !oSettings.oFeatures.bServerSide) {
+                                return fnCreateColumnSelect(oTable, null, _fnColumnIndex(iColumn), nTh, sLabel, bRegex, oSelected); //Issue 37
+                            }
+                        };
+                    })(i, th, label),
+                    "sName": "column_filter_" + i
+                });
+            }
+            // Regardless of the Ajax state, build the select on first pass
+            fnCreateColumnSelect(oTable, aData, _fnColumnIndex(i), th, label, bRegex, oSelected); //Issue 37
+
+        }
+
+        function fnCreateCheckbox(oTable, aData) {
+
+            if (aData == null)
+                aData = _fnGetColumnValues(oTable.fnSettings(), i, true, true, true);
+            var index = i;
+
+            var r = '', j, iLen = aData.length;
+
+            //clean the string
+            var localLabel = label.replace('%', 'Perc').replace("&", "AND").replace("$", "DOL").replace("?", "STERL").replace("@", "AT").replace(/\s/g, "_");
+            localLabel = localLabel.replace(/[^a-zA-Z 0-9]+/g, '');
+            //clean the string
+
+            //button label override
+            var labelBtn = label;
+            if (properties.sFilterButtonText != null || properties.sFilterButtonText != undefined) {
+                labelBtn = properties.sFilterButtonText;
+            }
+
+            var relativeDivWidthToggleSize = 10;
+            var numRow = 12; //numero di checkbox per colonna
+            var numCol = Math.floor(iLen / numRow);
+            if (iLen % numRow > 0) {
+                numCol = numCol + 1;
+            };
+
+            //count how many column should be generated and split the div size
+            var divWidth = 100 / numCol - 2;
+
+            var divWidthToggle = relativeDivWidthToggleSize * numCol;
+
+            if (numCol == 1) {
+                divWidth = 20;
+            }
+
+            var divRowDef = '<div style="float:left; min-width: ' + divWidth + '%; " >';
+            var divClose = '</div>';
+
+            var uniqueId = oTable.attr("id") + localLabel;
+            var buttonId = "chkBtnOpen" + uniqueId;
+            var checkToggleDiv = uniqueId + "-flt-toggle";
+            r += '<button id="' + buttonId + '" class="checkbox_filter" > ' + labelBtn + '</button>'; //filter button witch open dialog
+            r += '<div id="' + checkToggleDiv + '" '
+		+ 'title="' + label + '" '
+		+ 'class="toggle-check ui-widget-content ui-corner-all"  style="width: ' + (divWidthToggle) + '%; " >'; //dialog div
+            //r+= '<div align="center" style="margin-top: 5px; "> <button id="'+buttonId+'Reset" class="checkbox_filter" > reset </button> </div>'; //reset button and its div
+            r += divRowDef;
+
+            for (j = 0; j < iLen; j++) {
+
+                //if last check close div
+                if (j % numRow == 0 && j != 0) {
+                    r += divClose + divRowDef;
+                }
+
+                //check button
+                r += '<input class="search_init checkbox_filter" type="checkbox" id= "' + aData[j] + '" name= "' + localLabel + '" value="' + aData[j] + '" >' + aData[j] + '<br/>';
+
+                var checkbox = $(r);
+                th.html(checkbox);
+                th.wrapInner('<span class="filter_column filter_checkbox" />');
+                //on every checkbox selection
+                checkbox.change(function () {
+
+                    var search = '';
+                    var or = '|'; //var for select checks in 'or' into the regex
+                    var resSize = $('input:checkbox[name="' + localLabel + '"]:checked').size();
+                    $('input:checkbox[name="' + localLabel + '"]:checked').each(function (index) {
+
+                        //search = search + ' ' + $(this).val();
+                        //concatenation for selected checks in or
+                        if ((index == 0 && resSize == 1)
+						|| (index != 0 && index == resSize - 1)) {
+                            or = '';
+                        }
+                        //trim
+                        search = search.replace(/^\s+|\s+$/g, "");
+                        search = search + $(this).val() + or;
+                        or = '|';
+
+                    });
+
+                    for (var jj = 0; jj < iLen; jj++) {
+                        if (search != "") {
+                            $('#' + aData[jj]).removeClass("search_init");
+                        } else {
+                            $('#' + aData[jj]).addClass("search_init");
+                        }
+                    }
+
+                    //execute search
+                    oTable.fnFilter(search, index, true, false);
+                    fnOnFiltered();
+                });
+            }
+
+            //filter button
+            $('#' + buttonId).button();
+            //dialog
+            $('#' + checkToggleDiv).dialog({
+                //height: 140,
+                autoOpen: false,
+                //show: "blind",
+                hide: "blind",
+                buttons: [{
+                    text: "Reset",
+                    click: function () {
+                        //$('#'+buttonId).removeClass("filter_selected"); //LM remove border if filter selected
+                        $('input:checkbox[name="' + localLabel + '"]:checked').each(function (index3) {
+                            $(this).attr('checked', false);
+                            $(this).addClass("search_init");
+                        });
+                        oTable.fnFilter('', index, true, false);
+                        fnOnFiltered();
+                        return false;
+                    }
+                },
+							{
+							    text: "Close",
+							    click: function () { $(this).dialog("close"); }
+							}
+						]
+            });
+
+
+            $('#' + buttonId).click(function () {
+
+                $('#' + checkToggleDiv).dialog('open');
+                var target = $(this);
+                $('#' + checkToggleDiv).dialog("widget").position({ my: 'top',
+                    at: 'bottom',
+                    of: target
+                });
+
+                return false;
+            });
+
+            var fnOnFilteredCurrent = fnOnFiltered;
+
+            fnOnFiltered = function () {
+                var target = $('#' + buttonId);
+                $('#' + checkToggleDiv).dialog("widget").position({ my: 'top',
+                    at: 'bottom',
+                    of: target
+                });
+                fnOnFilteredCurrent();
+            };
+            //reset
+            /*
+            $('#'+buttonId+"Reset").button();
+            $('#'+buttonId+"Reset").click(function(){
+            $('#'+buttonId).removeClass("filter_selected"); //LM remove border if filter selected
+            $('input:checkbox[name="'+localLabel+'"]:checked').each(function(index3) {
+            $(this).attr('checked', false);
+            $(this).addClass("search_init");
+            });
+            oTable.fnFilter('', index, true, false);
+            return false;
+            });
+            */
+        }
+
+
+
+
+        function _fnRangeLabelPart(iPlace) {
+            switch (iPlace) {
+                case 0:
+                    return sRangeFormat.substring(0, sRangeFormat.indexOf("{from}"));
+                case 1:
+                    return sRangeFormat.substring(sRangeFormat.indexOf("{from}") + 6, sRangeFormat.indexOf("{to}"));
+                default:
+                    return sRangeFormat.substring(sRangeFormat.indexOf("{to}") + 4);
+            }
+        }
+
+
+
+
+        var oTable = this;
+
+        var defaults = {
+            sPlaceHolder: "foot",
+            sRangeSeparator: "~",
+            iFilteringDelay: 500,
+            aoColumns: null,
+            sRangeFormat: "From {from} to {to}",
+            sDateFromToken: "from",
+            sDateToToken: "to"
+        };
+
+        var properties = $.extend(defaults, options);
+
+        return this.each(function () {
+
+            if (!oTable.fnSettings().oFeatures.bFilter)
+                return;
+            asInitVals = new Array();
+
+            var aoFilterCells = oTable.fnSettings().aoFooter[0];
+
+            var oHost = oTable.fnSettings().nTFoot; //Before fix for ColVis
+            var sFilterRow = "tr"; //Before fix for ColVis
+
+            if (properties.sPlaceHolder == "head:after") {
+                var tr = $("tr:first", oTable.fnSettings().nTHead).detach();
+                //tr.appendTo($(oTable.fnSettings().nTHead));
+                if (oTable.fnSettings().bSortCellsTop) {
+                    tr.prependTo($(oTable.fnSettings().nTHead));
+                    //tr.appendTo($("thead", oTable));
+                    aoFilterCells = oTable.fnSettings().aoHeader[1];
+                }
+                else {
+                    tr.appendTo($(oTable.fnSettings().nTHead));
+                    //tr.prependTo($("thead", oTable));
+                    aoFilterCells = oTable.fnSettings().aoHeader[0];
+                }
+
+                sFilterRow = "tr:last";
+                oHost = oTable.fnSettings().nTHead;
+
+            } else if (properties.sPlaceHolder == "head:before") {
+
+                if (oTable.fnSettings().bSortCellsTop) {
+                    var tr = $("tr:first", oTable.fnSettings().nTHead).detach();
+                    tr.appendTo($(oTable.fnSettings().nTHead));
+                    aoFilterCells = oTable.fnSettings().aoHeader[1];
+                } else {
+                    aoFilterCells = oTable.fnSettings().aoHeader[0];
+                }
+                /*else {
+                //tr.prependTo($("thead", oTable));
+                sFilterRow = "tr:first";
+                }*/
+
+                sFilterRow = "tr:first";
+
+                oHost = oTable.fnSettings().nTHead;
+
+
+            }
+
+            //$(sFilterRow + " th", oHost).each(function (index) {//bug with ColVis
+            $(aoFilterCells).each(function (index) {//fix for ColVis
+                i = index;
+                var aoColumn = { type: "text",
+                    bRegex: false,
+                    bSmart: true,
+                    iMaxLenght: -1,
+                    iFilterLength: 0
+                };
+                if (properties.aoColumns != null) {
+                    if (properties.aoColumns.length < i || properties.aoColumns[i] == null)
+                        return;
+                    aoColumn = properties.aoColumns[i];
+                }
+                //label = $(this).text(); //Before fix for ColVis
+                label = $($(this)[0].cell).text(); //Fix for ColVis
+                if (aoColumn.sSelector == null) {
+                    //th = $($(this)[0]);//Before fix for ColVis
+                    th = $($(this)[0].cell); //Fix for ColVis
+                }
+                else {
+                    th = $(aoColumn.sSelector);
+                    if (th.length == 0)
+                        th = $($(this)[0].cell);
+                }
+
+                if (aoColumn != null) {
+                    if (aoColumn.sRangeFormat != null)
+                        sRangeFormat = aoColumn.sRangeFormat;
+                    else
+                        sRangeFormat = properties.sRangeFormat;
+                    switch (aoColumn.type) {
+                        case "null":
+                            break;
+                        case "number":
+                            fnCreateInput(oTable, true, false, true, aoColumn.iFilterLength, aoColumn.iMaxLenght);
+                            break;
+                        case "select":
+                            if (aoColumn.bRegex != true)
+                                aoColumn.bRegex = false;
+                            fnCreateSelect(oTable, aoColumn.values, aoColumn.bRegex, aoColumn.selected);
+                            break;
+                        case "number-range":
+                            fnCreateRangeInput(oTable);
+                            break;
+                        case "date-range":
+                            fnCreateDateRangeInput(oTable);
+                            break;
+                        case "checkbox":
+                            fnCreateCheckbox(oTable, aoColumn.values);
+                            break;
+                        case "text":
+                        default:
+                            bRegex = (aoColumn.bRegex == null ? false : aoColumn.bRegex);
+                            bSmart = (aoColumn.bSmart == null ? false : aoColumn.bSmart);
+                            fnCreateInput(oTable, bRegex, bSmart, false, aoColumn.iFilterLength, aoColumn.iMaxLenght);
+                            break;
+
+                    }
+                }
+            });
+
+            for (j = 0; j < aiCustomSearch_Indexes.length; j++) {
+                //var index = aiCustomSearch_Indexes[j];
+                var fnSearch_ = function () {
+                    var id = oTable.attr("id");
+                    return $("#" + id + "_range_from_" + aiCustomSearch_Indexes[j]).val() + properties.sRangeSeparator + $("#" + id + "_range_to_" + aiCustomSearch_Indexes[j]).val()
+                }
+                afnSearch_.push(fnSearch_);
+            }
+
+            if (oTable.fnSettings().oFeatures.bServerSide) {
+
+                var fnServerDataOriginal = oTable.fnSettings().fnServerData;
+
+                oTable.fnSettings().fnServerData = function (sSource, aoData, fnCallback) {
+
+                    for (j = 0; j < aiCustomSearch_Indexes.length; j++) {
+                        var index = aiCustomSearch_Indexes[j];
+
+                        for (k = 0; k < aoData.length; k++) {
+                            if (aoData[k].name == "sSearch_" + index)
+                                aoData[k].value = afnSearch_[j]();
+                        }
+                    }
+                    aoData.push({ "name": "sRangeSeparator", "value": properties.sRangeSeparator });
+
+                    if (fnServerDataOriginal != null) {
+                        try {
+                            fnServerDataOriginal(sSource, aoData, fnCallback, oTable.fnSettings()); //TODO: See Issue 18
+                        } catch (ex) {
+                            fnServerDataOriginal(sSource, aoData, fnCallback);
+                        }
+                    }
+                    else {
+                        $.getJSON(sSource, aoData, function (json) {
+                            fnCallback(json)
+                        });
+                    }
+                };
+
+            }
+
+        });
+
+    };
+
+
+
+
+})(jQuery);
diff --git a/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.min.js b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.min.js
new file mode 100644
index 0000000..02694a4
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.min.js
@@ -0,0 +1,155 @@
+/*
+ * File:        jquery.dataTables.min.js
+ * Version:     1.9.4
+ * Author:      Allan Jardine (www.sprymedia.co.uk)
+ * Info:        www.datatables.net
+ * 
+ * Copyright 2008-2012 Allan Jardine, all rights reserved.
+ *
+ * This source file is free software, under either the GPL v2 license or a
+ * BSD style license, available at:
+ *   http://datatables.net/license_gpl2
+ *   http://datatables.net/license_bsd
+ * 
+ * This source file is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
+ */
+(function(X,l,n){var L=function(h){var j=function(e){function o(a,b){var c=j.defaults.columns,d=a.aoColumns.length,c=h.extend({},j.models.oColumn,c,{sSortingClass:a.oClasses.sSortable,sSortingClassJUI:a.oClasses.sSortJUI,nTh:b?b:l.createElement("th"),sTitle:c.sTitle?c.sTitle:b?b.innerHTML:"",aDataSort:c.aDataSort?c.aDataSort:[d],mData:c.mData?c.oDefaults:d});a.aoColumns.push(c);if(a.aoPreSearchCols[d]===n||null===a.aoPreSearchCols[d])a.aoPreSearchCols[d]=h.extend({},j.models.oSearch);else if(c=a.aoPreSearchCols[d],
+c.bRegex===n&&(c.bRegex=!0),c.bSmart===n&&(c.bSmart=!0),c.bCaseInsensitive===n)c.bCaseInsensitive=!0;m(a,d,null)}function m(a,b,c){var d=a.aoColumns[b];c!==n&&null!==c&&(c.mDataProp&&!c.mData&&(c.mData=c.mDataProp),c.sType!==n&&(d.sType=c.sType,d._bAutoType=!1),h.extend(d,c),p(d,c,"sWidth","sWidthOrig"),c.iDataSort!==n&&(d.aDataSort=[c.iDataSort]),p(d,c,"aDataSort"));var i=d.mRender?Q(d.mRender):null,f=Q(d.mData);d.fnGetData=function(a,b){var c=f(a,b);return d.mRender&&b&&""!==b?i(c,b,a):c};d.fnSetData=
+L(d.mData);a.oFeatures.bSort||(d.bSortable=!1);!d.bSortable||-1==h.inArray("asc",d.asSorting)&&-1==h.inArray("desc",d.asSorting)?(d.sSortingClass=a.oClasses.sSortableNone,d.sSortingClassJUI=""):-1==h.inArray("asc",d.asSorting)&&-1==h.inArray("desc",d.asSorting)?(d.sSortingClass=a.oClasses.sSortable,d.sSortingClassJUI=a.oClasses.sSortJUI):-1!=h.inArray("asc",d.asSorting)&&-1==h.inArray("desc",d.asSorting)?(d.sSortingClass=a.oClasses.sSortableAsc,d.sSortingClassJUI=a.oClasses.sSortJUIAscAllowed):-1==
+h.inArray("asc",d.asSorting)&&-1!=h.inArray("desc",d.asSorting)&&(d.sSortingClass=a.oClasses.sSortableDesc,d.sSortingClassJUI=a.oClasses.sSortJUIDescAllowed)}function k(a){if(!1===a.oFeatures.bAutoWidth)return!1;da(a);for(var b=0,c=a.aoColumns.length;b<c;b++)a.aoColumns[b].nTh.style.width=a.aoColumns[b].sWidth}function G(a,b){var c=r(a,"bVisible");return"number"===typeof c[b]?c[b]:null}function R(a,b){var c=r(a,"bVisible"),c=h.inArray(b,c);return-1!==c?c:null}function t(a){return r(a,"bVisible").length}
+function r(a,b){var c=[];h.map(a.aoColumns,function(a,i){a[b]&&c.push(i)});return c}function B(a){for(var b=j.ext.aTypes,c=b.length,d=0;d<c;d++){var i=b[d](a);if(null!==i)return i}return"string"}function u(a,b){for(var c=b.split(","),d=[],i=0,f=a.aoColumns.length;i<f;i++)for(var g=0;g<f;g++)if(a.aoColumns[i].sName==c[g]){d.push(g);break}return d}function M(a){for(var b="",c=0,d=a.aoColumns.length;c<d;c++)b+=a.aoColumns[c].sName+",";return b.length==d?"":b.slice(0,-1)}function ta(a,b,c,d){var i,f,
+g,e,w;if(b)for(i=b.length-1;0<=i;i--){var j=b[i].aTargets;h.isArray(j)||D(a,1,"aTargets must be an array of targets, not a "+typeof j);f=0;for(g=j.length;f<g;f++)if("number"===typeof j[f]&&0<=j[f]){for(;a.aoColumns.length<=j[f];)o(a);d(j[f],b[i])}else if("number"===typeof j[f]&&0>j[f])d(a.aoColumns.length+j[f],b[i]);else if("string"===typeof j[f]){e=0;for(w=a.aoColumns.length;e<w;e++)("_all"==j[f]||h(a.aoColumns[e].nTh).hasClass(j[f]))&&d(e,b[i])}}if(c){i=0;for(a=c.length;i<a;i++)d(i,c[i])}}function H(a,
+b){var c;c=h.isArray(b)?b.slice():h.extend(!0,{},b);var d=a.aoData.length,i=h.extend(!0,{},j.models.oRow);i._aData=c;a.aoData.push(i);for(var f,i=0,g=a.aoColumns.length;i<g;i++)c=a.aoColumns[i],"function"===typeof c.fnRender&&c.bUseRendered&&null!==c.mData?F(a,d,i,S(a,d,i)):F(a,d,i,v(a,d,i)),c._bAutoType&&"string"!=c.sType&&(f=v(a,d,i,"type"),null!==f&&""!==f&&(f=B(f),null===c.sType?c.sType=f:c.sType!=f&&"html"!=c.sType&&(c.sType="string")));a.aiDisplayMaster.push(d);a.oFeatures.bDeferRender||ea(a,
+d);return d}function ua(a){var b,c,d,i,f,g,e;if(a.bDeferLoading||null===a.sAjaxSource)for(b=a.nTBody.firstChild;b;){if("TR"==b.nodeName.toUpperCase()){c=a.aoData.length;b._DT_RowIndex=c;a.aoData.push(h.extend(!0,{},j.models.oRow,{nTr:b}));a.aiDisplayMaster.push(c);f=b.firstChild;for(d=0;f;){g=f.nodeName.toUpperCase();if("TD"==g||"TH"==g)F(a,c,d,h.trim(f.innerHTML)),d++;f=f.nextSibling}}b=b.nextSibling}i=T(a);d=[];b=0;for(c=i.length;b<c;b++)for(f=i[b].firstChild;f;)g=f.nodeName.toUpperCase(),("TD"==
+g||"TH"==g)&&d.push(f),f=f.nextSibling;c=0;for(i=a.aoColumns.length;c<i;c++){e=a.aoColumns[c];null===e.sTitle&&(e.sTitle=e.nTh.innerHTML);var w=e._bAutoType,o="function"===typeof e.fnRender,k=null!==e.sClass,n=e.bVisible,m,p;if(w||o||k||!n){g=0;for(b=a.aoData.length;g<b;g++)f=a.aoData[g],m=d[g*i+c],w&&"string"!=e.sType&&(p=v(a,g,c,"type"),""!==p&&(p=B(p),null===e.sType?e.sType=p:e.sType!=p&&"html"!=e.sType&&(e.sType="string"))),e.mRender?m.innerHTML=v(a,g,c,"display"):e.mData!==c&&(m.innerHTML=v(a,
+g,c,"display")),o&&(p=S(a,g,c),m.innerHTML=p,e.bUseRendered&&F(a,g,c,p)),k&&(m.className+=" "+e.sClass),n?f._anHidden[c]=null:(f._anHidden[c]=m,m.parentNode.removeChild(m)),e.fnCreatedCell&&e.fnCreatedCell.call(a.oInstance,m,v(a,g,c,"display"),f._aData,g,c)}}if(0!==a.aoRowCreatedCallback.length){b=0;for(c=a.aoData.length;b<c;b++)f=a.aoData[b],A(a,"aoRowCreatedCallback",null,[f.nTr,f._aData,b])}}function I(a,b){return b._DT_RowIndex!==n?b._DT_RowIndex:null}function fa(a,b,c){for(var b=J(a,b),d=0,a=
+a.aoColumns.length;d<a;d++)if(b[d]===c)return d;return-1}function Y(a,b,c,d){for(var i=[],f=0,g=d.length;f<g;f++)i.push(v(a,b,d[f],c));return i}function v(a,b,c,d){var i=a.aoColumns[c];if((c=i.fnGetData(a.aoData[b]._aData,d))===n)return a.iDrawError!=a.iDraw&&null===i.sDefaultContent&&(D(a,0,"Requested unknown parameter "+("function"==typeof i.mData?"{mData function}":"'"+i.mData+"'")+" from the data source for row "+b),a.iDrawError=a.iDraw),i.sDefaultContent;if(null===c&&null!==i.sDefaultContent)c=
+i.sDefaultContent;else if("function"===typeof c)return c();return"display"==d&&null===c?"":c}function F(a,b,c,d){a.aoColumns[c].fnSetData(a.aoData[b]._aData,d)}function Q(a){if(null===a)return function(){return null};if("function"===typeof a)return function(b,d,i){return a(b,d,i)};if("string"===typeof a&&(-1!==a.indexOf(".")||-1!==a.indexOf("["))){var b=function(a,d,i){var f=i.split("."),g;if(""!==i){var e=0;for(g=f.length;e<g;e++){if(i=f[e].match(U)){f[e]=f[e].replace(U,"");""!==f[e]&&(a=a[f[e]]);
+g=[];f.splice(0,e+1);for(var f=f.join("."),e=0,h=a.length;e<h;e++)g.push(b(a[e],d,f));a=i[0].substring(1,i[0].length-1);a=""===a?g:g.join(a);break}if(null===a||a[f[e]]===n)return n;a=a[f[e]]}}return a};return function(c,d){return b(c,d,a)}}return function(b){return b[a]}}function L(a){if(null===a)return function(){};if("function"===typeof a)return function(b,d){a(b,"set",d)};if("string"===typeof a&&(-1!==a.indexOf(".")||-1!==a.indexOf("["))){var b=function(a,d,i){var i=i.split("."),f,g,e=0;for(g=
+i.length-1;e<g;e++){if(f=i[e].match(U)){i[e]=i[e].replace(U,"");a[i[e]]=[];f=i.slice();f.splice(0,e+1);g=f.join(".");for(var h=0,j=d.length;h<j;h++)f={},b(f,d[h],g),a[i[e]].push(f);return}if(null===a[i[e]]||a[i[e]]===n)a[i[e]]={};a=a[i[e]]}a[i[i.length-1].replace(U,"")]=d};return function(c,d){return b(c,d,a)}}return function(b,d){b[a]=d}}function Z(a){for(var b=[],c=a.aoData.length,d=0;d<c;d++)b.push(a.aoData[d]._aData);return b}function ga(a){a.aoData.splice(0,a.aoData.length);a.aiDisplayMaster.splice(0,
+a.aiDisplayMaster.length);a.aiDisplay.splice(0,a.aiDisplay.length);y(a)}function ha(a,b){for(var c=-1,d=0,i=a.length;d<i;d++)a[d]==b?c=d:a[d]>b&&a[d]--; -1!=c&&a.splice(c,1)}function S(a,b,c){var d=a.aoColumns[c];return d.fnRender({iDataRow:b,iDataColumn:c,oSettings:a,aData:a.aoData[b]._aData,mDataProp:d.mData},v(a,b,c,"display"))}function ea(a,b){var c=a.aoData[b],d;if(null===c.nTr){c.nTr=l.createElement("tr");c.nTr._DT_RowIndex=b;c._aData.DT_RowId&&(c.nTr.id=c._aData.DT_RowId);c._aData.DT_RowClass&&
+(c.nTr.className=c._aData.DT_RowClass);for(var i=0,f=a.aoColumns.length;i<f;i++){var g=a.aoColumns[i];d=l.createElement(g.sCellType);d.innerHTML="function"===typeof g.fnRender&&(!g.bUseRendered||null===g.mData)?S(a,b,i):v(a,b,i,"display");null!==g.sClass&&(d.className=g.sClass);g.bVisible?(c.nTr.appendChild(d),c._anHidden[i]=null):c._anHidden[i]=d;g.fnCreatedCell&&g.fnCreatedCell.call(a.oInstance,d,v(a,b,i,"display"),c._aData,b,i)}A(a,"aoRowCreatedCallback",null,[c.nTr,c._aData,b])}}function va(a){var b,
+c,d;if(0!==h("th, td",a.nTHead).length){b=0;for(d=a.aoColumns.length;b<d;b++)if(c=a.aoColumns[b].nTh,c.setAttribute("role","columnheader"),a.aoColumns[b].bSortable&&(c.setAttribute("tabindex",a.iTabIndex),c.setAttribute("aria-controls",a.sTableId)),null!==a.aoColumns[b].sClass&&h(c).addClass(a.aoColumns[b].sClass),a.aoColumns[b].sTitle!=c.innerHTML)c.innerHTML=a.aoColumns[b].sTitle}else{var i=l.createElement("tr");b=0;for(d=a.aoColumns.length;b<d;b++)c=a.aoColumns[b].nTh,c.innerHTML=a.aoColumns[b].sTitle,
+c.setAttribute("tabindex","0"),null!==a.aoColumns[b].sClass&&h(c).addClass(a.aoColumns[b].sClass),i.appendChild(c);h(a.nTHead).html("")[0].appendChild(i);V(a.aoHeader,a.nTHead)}h(a.nTHead).children("tr").attr("role","row");if(a.bJUI){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;i=l.createElement("div");i.className=a.oClasses.sSortJUIWrapper;h(c).contents().appendTo(i);var f=l.createElement("span");f.className=a.oClasses.sSortIcon;i.appendChild(f);c.appendChild(i)}}if(a.oFeatures.bSort)for(b=
+0;b<a.aoColumns.length;b++)!1!==a.aoColumns[b].bSortable?ia(a,a.aoColumns[b].nTh,b):h(a.aoColumns[b].nTh).addClass(a.oClasses.sSortableNone);""!==a.oClasses.sFooterTH&&h(a.nTFoot).children("tr").children("th").addClass(a.oClasses.sFooterTH);if(null!==a.nTFoot){c=N(a,null,a.aoFooter);b=0;for(d=a.aoColumns.length;b<d;b++)c[b]&&(a.aoColumns[b].nTf=c[b],a.aoColumns[b].sClass&&h(c[b]).addClass(a.aoColumns[b].sClass))}}function W(a,b,c){var d,i,f,g=[],e=[],h=a.aoColumns.length,j;c===n&&(c=!1);d=0;for(i=
+b.length;d<i;d++){g[d]=b[d].slice();g[d].nTr=b[d].nTr;for(f=h-1;0<=f;f--)!a.aoColumns[f].bVisible&&!c&&g[d].splice(f,1);e.push([])}d=0;for(i=g.length;d<i;d++){if(a=g[d].nTr)for(;f=a.firstChild;)a.removeChild(f);f=0;for(b=g[d].length;f<b;f++)if(j=h=1,e[d][f]===n){a.appendChild(g[d][f].cell);for(e[d][f]=1;g[d+h]!==n&&g[d][f].cell==g[d+h][f].cell;)e[d+h][f]=1,h++;for(;g[d][f+j]!==n&&g[d][f].cell==g[d][f+j].cell;){for(c=0;c<h;c++)e[d+c][f+j]=1;j++}g[d][f].cell.rowSpan=h;g[d][f].cell.colSpan=j}}}function x(a){var b=
+A(a,"aoPreDrawCallback","preDraw",[a]);if(-1!==h.inArray(!1,b))E(a,!1);else{var c,d,b=[],i=0,f=a.asStripeClasses.length;c=a.aoOpenRows.length;a.bDrawing=!0;a.iInitDisplayStart!==n&&-1!=a.iInitDisplayStart&&(a._iDisplayStart=a.oFeatures.bServerSide?a.iInitDisplayStart:a.iInitDisplayStart>=a.fnRecordsDisplay()?0:a.iInitDisplayStart,a.iInitDisplayStart=-1,y(a));if(a.bDeferLoading)a.bDeferLoading=!1,a.iDraw++;else if(a.oFeatures.bServerSide){if(!a.bDestroying&&!wa(a))return}else a.iDraw++;if(0!==a.aiDisplay.length){var g=
+a._iDisplayStart;d=a._iDisplayEnd;a.oFeatures.bServerSide&&(g=0,d=a.aoData.length);for(;g<d;g++){var e=a.aoData[a.aiDisplay[g]];null===e.nTr&&ea(a,a.aiDisplay[g]);var j=e.nTr;if(0!==f){var o=a.asStripeClasses[i%f];e._sRowStripe!=o&&(h(j).removeClass(e._sRowStripe).addClass(o),e._sRowStripe=o)}A(a,"aoRowCallback",null,[j,a.aoData[a.aiDisplay[g]]._aData,i,g]);b.push(j);i++;if(0!==c)for(e=0;e<c;e++)if(j==a.aoOpenRows[e].nParent){b.push(a.aoOpenRows[e].nTr);break}}}else b[0]=l.createElement("tr"),a.asStripeClasses[0]&&
+(b[0].className=a.asStripeClasses[0]),c=a.oLanguage,f=c.sZeroRecords,1==a.iDraw&&null!==a.sAjaxSource&&!a.oFeatures.bServerSide?f=c.sLoadingRecords:c.sEmptyTable&&0===a.fnRecordsTotal()&&(f=c.sEmptyTable),c=l.createElement("td"),c.setAttribute("valign","top"),c.colSpan=t(a),c.className=a.oClasses.sRowEmpty,c.innerHTML=ja(a,f),b[i].appendChild(c);A(a,"aoHeaderCallback","header",[h(a.nTHead).children("tr")[0],Z(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay]);A(a,"aoFooterCallback","footer",[h(a.nTFoot).children("tr")[0],
+Z(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay]);i=l.createDocumentFragment();c=l.createDocumentFragment();if(a.nTBody){f=a.nTBody.parentNode;c.appendChild(a.nTBody);if(!a.oScroll.bInfinite||!a._bInitComplete||a.bSorted||a.bFiltered)for(;c=a.nTBody.firstChild;)a.nTBody.removeChild(c);c=0;for(d=b.length;c<d;c++)i.appendChild(b[c]);a.nTBody.appendChild(i);null!==f&&f.appendChild(a.nTBody)}A(a,"aoDrawCallback","draw",[a]);a.bSorted=!1;a.bFiltered=!1;a.bDrawing=!1;a.oFeatures.bServerSide&&(E(a,!1),
+a._bInitComplete||$(a))}}function aa(a){a.oFeatures.bSort?O(a,a.oPreviousSearch):a.oFeatures.bFilter?K(a,a.oPreviousSearch):(y(a),x(a))}function xa(a){var b=h("<div></div>")[0];a.nTable.parentNode.insertBefore(b,a.nTable);a.nTableWrapper=h('<div id="'+a.sTableId+'_wrapper" class="'+a.oClasses.sWrapper+'" role="grid"></div>')[0];a.nTableReinsertBefore=a.nTable.nextSibling;for(var c=a.nTableWrapper,d=a.sDom.split(""),i,f,g,e,w,o,k,m=0;m<d.length;m++){f=0;g=d[m];if("<"==g){e=h("<div></div>")[0];w=d[m+
+1];if("'"==w||'"'==w){o="";for(k=2;d[m+k]!=w;)o+=d[m+k],k++;"H"==o?o=a.oClasses.sJUIHeader:"F"==o&&(o=a.oClasses.sJUIFooter);-1!=o.indexOf(".")?(w=o.split("."),e.id=w[0].substr(1,w[0].length-1),e.className=w[1]):"#"==o.charAt(0)?e.id=o.substr(1,o.length-1):e.className=o;m+=k}c.appendChild(e);c=e}else if(">"==g)c=c.parentNode;else if("l"==g&&a.oFeatures.bPaginate&&a.oFeatures.bLengthChange)i=ya(a),f=1;else if("f"==g&&a.oFeatures.bFilter)i=za(a),f=1;else if("r"==g&&a.oFeatures.bProcessing)i=Aa(a),f=
+1;else if("t"==g)i=Ba(a),f=1;else if("i"==g&&a.oFeatures.bInfo)i=Ca(a),f=1;else if("p"==g&&a.oFeatures.bPaginate)i=Da(a),f=1;else if(0!==j.ext.aoFeatures.length){e=j.ext.aoFeatures;k=0;for(w=e.length;k<w;k++)if(g==e[k].cFeature){(i=e[k].fnInit(a))&&(f=1);break}}1==f&&null!==i&&("object"!==typeof a.aanFeatures[g]&&(a.aanFeatures[g]=[]),a.aanFeatures[g].push(i),c.appendChild(i))}b.parentNode.replaceChild(a.nTableWrapper,b)}function V(a,b){var c=h(b).children("tr"),d,i,f,g,e,j,o,k,m,p;a.splice(0,a.length);
+f=0;for(j=c.length;f<j;f++)a.push([]);f=0;for(j=c.length;f<j;f++){d=c[f];for(i=d.firstChild;i;){if("TD"==i.nodeName.toUpperCase()||"TH"==i.nodeName.toUpperCase()){k=1*i.getAttribute("colspan");m=1*i.getAttribute("rowspan");k=!k||0===k||1===k?1:k;m=!m||0===m||1===m?1:m;g=0;for(e=a[f];e[g];)g++;o=g;p=1===k?!0:!1;for(e=0;e<k;e++)for(g=0;g<m;g++)a[f+g][o+e]={cell:i,unique:p},a[f+g].nTr=d}i=i.nextSibling}}}function N(a,b,c){var d=[];c||(c=a.aoHeader,b&&(c=[],V(c,b)));for(var b=0,i=c.length;b<i;b++)for(var f=
+0,g=c[b].length;f<g;f++)if(c[b][f].unique&&(!d[f]||!a.bSortCellsTop))d[f]=c[b][f].cell;return d}function wa(a){if(a.bAjaxDataGet){a.iDraw++;E(a,!0);var b=Ea(a);ka(a,b);a.fnServerData.call(a.oInstance,a.sAjaxSource,b,function(b){Fa(a,b)},a);return!1}return!0}function Ea(a){var b=a.aoColumns.length,c=[],d,i,f,g;c.push({name:"sEcho",value:a.iDraw});c.push({name:"iColumns",value:b});c.push({name:"sColumns",value:M(a)});c.push({name:"iDisplayStart",value:a._iDisplayStart});c.push({name:"iDisplayLength",
+value:!1!==a.oFeatures.bPaginate?a._iDisplayLength:-1});for(f=0;f<b;f++)d=a.aoColumns[f].mData,c.push({name:"mDataProp_"+f,value:"function"===typeof d?"function":d});if(!1!==a.oFeatures.bFilter){c.push({name:"sSearch",value:a.oPreviousSearch.sSearch});c.push({name:"bRegex",value:a.oPreviousSearch.bRegex});for(f=0;f<b;f++)c.push({name:"sSearch_"+f,value:a.aoPreSearchCols[f].sSearch}),c.push({name:"bRegex_"+f,value:a.aoPreSearchCols[f].bRegex}),c.push({name:"bSearchable_"+f,value:a.aoColumns[f].bSearchable})}if(!1!==
+a.oFeatures.bSort){var e=0;d=null!==a.aaSortingFixed?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(f=0;f<d.length;f++){i=a.aoColumns[d[f][0]].aDataSort;for(g=0;g<i.length;g++)c.push({name:"iSortCol_"+e,value:i[g]}),c.push({name:"sSortDir_"+e,value:d[f][1]}),e++}c.push({name:"iSortingCols",value:e});for(f=0;f<b;f++)c.push({name:"bSortable_"+f,value:a.aoColumns[f].bSortable})}return c}function ka(a,b){A(a,"aoServerParams","serverParams",[b])}function Fa(a,b){if(b.sEcho!==n){if(1*b.sEcho<
+a.iDraw)return;a.iDraw=1*b.sEcho}(!a.oScroll.bInfinite||a.oScroll.bInfinite&&(a.bSorted||a.bFiltered))&&ga(a);a._iRecordsTotal=parseInt(b.iTotalRecords,10);a._iRecordsDisplay=parseInt(b.iTotalDisplayRecords,10);var c=M(a),c=b.sColumns!==n&&""!==c&&b.sColumns!=c,d;c&&(d=u(a,b.sColumns));for(var i=Q(a.sAjaxDataProp)(b),f=0,g=i.length;f<g;f++)if(c){for(var e=[],h=0,j=a.aoColumns.length;h<j;h++)e.push(i[f][d[h]]);H(a,e)}else H(a,i[f]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=!1;x(a);a.bAjaxDataGet=
+!0;E(a,!1)}function za(a){var b=a.oPreviousSearch,c=a.oLanguage.sSearch,c=-1!==c.indexOf("_INPUT_")?c.replace("_INPUT_",'<input type="text" />'):""===c?'<input type="text" />':c+' <input type="text" />',d=l.createElement("div");d.className=a.oClasses.sFilter;d.innerHTML="<label>"+c+"</label>";a.aanFeatures.f||(d.id=a.sTableId+"_filter");c=h('input[type="text"]',d);d._DT_Input=c[0];c.val(b.sSearch.replace('"',"&quot;"));c.bind("keyup.DT",function(){for(var c=a.aanFeatures.f,d=this.value===""?"":this.value,
+g=0,e=c.length;g<e;g++)c[g]!=h(this).parents("div.dataTables_filter")[0]&&h(c[g]._DT_Input).val(d);d!=b.sSearch&&K(a,{sSearch:d,bRegex:b.bRegex,bSmart:b.bSmart,bCaseInsensitive:b.bCaseInsensitive})});c.attr("aria-controls",a.sTableId).bind("keypress.DT",function(a){if(a.keyCode==13)return false});return d}function K(a,b,c){var d=a.oPreviousSearch,i=a.aoPreSearchCols,f=function(a){d.sSearch=a.sSearch;d.bRegex=a.bRegex;d.bSmart=a.bSmart;d.bCaseInsensitive=a.bCaseInsensitive};if(a.oFeatures.bServerSide)f(b);
+else{Ga(a,b.sSearch,c,b.bRegex,b.bSmart,b.bCaseInsensitive);f(b);for(b=0;b<a.aoPreSearchCols.length;b++)Ha(a,i[b].sSearch,b,i[b].bRegex,i[b].bSmart,i[b].bCaseInsensitive);Ia(a)}a.bFiltered=!0;h(a.oInstance).trigger("filter",a);a._iDisplayStart=0;y(a);x(a);la(a,0)}function Ia(a){for(var b=j.ext.afnFiltering,c=r(a,"bSearchable"),d=0,i=b.length;d<i;d++)for(var f=0,g=0,e=a.aiDisplay.length;g<e;g++){var h=a.aiDisplay[g-f];b[d](a,Y(a,h,"filter",c),h)||(a.aiDisplay.splice(g-f,1),f++)}}function Ha(a,b,c,
+d,i,f){if(""!==b)for(var g=0,b=ma(b,d,i,f),d=a.aiDisplay.length-1;0<=d;d--)i=Ja(v(a,a.aiDisplay[d],c,"filter"),a.aoColumns[c].sType),b.test(i)||(a.aiDisplay.splice(d,1),g++)}function Ga(a,b,c,d,i,f){d=ma(b,d,i,f);i=a.oPreviousSearch;c||(c=0);0!==j.ext.afnFiltering.length&&(c=1);if(0>=b.length)a.aiDisplay.splice(0,a.aiDisplay.length),a.aiDisplay=a.aiDisplayMaster.slice();else if(a.aiDisplay.length==a.aiDisplayMaster.length||i.sSearch.length>b.length||1==c||0!==b.indexOf(i.sSearch)){a.aiDisplay.splice(0,
+a.aiDisplay.length);la(a,1);for(b=0;b<a.aiDisplayMaster.length;b++)d.test(a.asDataSearch[b])&&a.aiDisplay.push(a.aiDisplayMaster[b])}else for(b=c=0;b<a.asDataSearch.length;b++)d.test(a.asDataSearch[b])||(a.aiDisplay.splice(b-c,1),c++)}function la(a,b){if(!a.oFeatures.bServerSide){a.asDataSearch=[];for(var c=r(a,"bSearchable"),d=1===b?a.aiDisplayMaster:a.aiDisplay,i=0,f=d.length;i<f;i++)a.asDataSearch[i]=na(a,Y(a,d[i],"filter",c))}}function na(a,b){var c=b.join("  ");-1!==c.indexOf("&")&&(c=h("<div>").html(c).text());
+return c.replace(/[\n\r]/g," ")}function ma(a,b,c,d){if(c)return a=b?a.split(" "):oa(a).split(" "),a="^(?=.*?"+a.join(")(?=.*?")+").*$",RegExp(a,d?"i":"");a=b?a:oa(a);return RegExp(a,d?"i":"")}function Ja(a,b){return"function"===typeof j.ext.ofnSearch[b]?j.ext.ofnSearch[b](a):null===a?"":"html"==b?a.replace(/[\r\n]/g," ").replace(/<.*?>/g,""):"string"===typeof a?a.replace(/[\r\n]/g," "):a}function oa(a){return a.replace(RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^|\\-)","g"),
+"\\$1")}function Ca(a){var b=l.createElement("div");b.className=a.oClasses.sInfo;a.aanFeatures.i||(a.aoDrawCallback.push({fn:Ka,sName:"information"}),b.id=a.sTableId+"_info");a.nTable.setAttribute("aria-describedby",a.sTableId+"_info");return b}function Ka(a){if(a.oFeatures.bInfo&&0!==a.aanFeatures.i.length){var b=a.oLanguage,c=a._iDisplayStart+1,d=a.fnDisplayEnd(),i=a.fnRecordsTotal(),f=a.fnRecordsDisplay(),g;g=0===f?b.sInfoEmpty:b.sInfo;f!=i&&(g+=" "+b.sInfoFiltered);g+=b.sInfoPostFix;g=ja(a,g);
+null!==b.fnInfoCallback&&(g=b.fnInfoCallback.call(a.oInstance,a,c,d,i,f,g));a=a.aanFeatures.i;b=0;for(c=a.length;b<c;b++)h(a[b]).html(g)}}function ja(a,b){var c=a.fnFormatNumber(a._iDisplayStart+1),d=a.fnDisplayEnd(),d=a.fnFormatNumber(d),i=a.fnRecordsDisplay(),i=a.fnFormatNumber(i),f=a.fnRecordsTotal(),f=a.fnFormatNumber(f);a.oScroll.bInfinite&&(c=a.fnFormatNumber(1));return b.replace(/_START_/g,c).replace(/_END_/g,d).replace(/_TOTAL_/g,i).replace(/_MAX_/g,f)}function ba(a){var b,c,d=a.iInitDisplayStart;
+if(!1===a.bInitialised)setTimeout(function(){ba(a)},200);else{xa(a);va(a);W(a,a.aoHeader);a.nTFoot&&W(a,a.aoFooter);E(a,!0);a.oFeatures.bAutoWidth&&da(a);b=0;for(c=a.aoColumns.length;b<c;b++)null!==a.aoColumns[b].sWidth&&(a.aoColumns[b].nTh.style.width=q(a.aoColumns[b].sWidth));a.oFeatures.bSort?O(a):a.oFeatures.bFilter?K(a,a.oPreviousSearch):(a.aiDisplay=a.aiDisplayMaster.slice(),y(a),x(a));null!==a.sAjaxSource&&!a.oFeatures.bServerSide?(c=[],ka(a,c),a.fnServerData.call(a.oInstance,a.sAjaxSource,
+c,function(c){var f=a.sAjaxDataProp!==""?Q(a.sAjaxDataProp)(c):c;for(b=0;b<f.length;b++)H(a,f[b]);a.iInitDisplayStart=d;if(a.oFeatures.bSort)O(a);else{a.aiDisplay=a.aiDisplayMaster.slice();y(a);x(a)}E(a,false);$(a,c)},a)):a.oFeatures.bServerSide||(E(a,!1),$(a))}}function $(a,b){a._bInitComplete=!0;A(a,"aoInitComplete","init",[a,b])}function pa(a){var b=j.defaults.oLanguage;!a.sEmptyTable&&(a.sZeroRecords&&"No data available in table"===b.sEmptyTable)&&p(a,a,"sZeroRecords","sEmptyTable");!a.sLoadingRecords&&
+(a.sZeroRecords&&"Loading..."===b.sLoadingRecords)&&p(a,a,"sZeroRecords","sLoadingRecords")}function ya(a){if(a.oScroll.bInfinite)return null;var b='<select size="1" '+('name="'+a.sTableId+'_length"')+">",c,d,i=a.aLengthMenu;if(2==i.length&&"object"===typeof i[0]&&"object"===typeof i[1]){c=0;for(d=i[0].length;c<d;c++)b+='<option value="'+i[0][c]+'">'+i[1][c]+"</option>"}else{c=0;for(d=i.length;c<d;c++)b+='<option value="'+i[c]+'">'+i[c]+"</option>"}b+="</select>";i=l.createElement("div");a.aanFeatures.l||
+(i.id=a.sTableId+"_length");i.className=a.oClasses.sLength;i.innerHTML="<label>"+a.oLanguage.sLengthMenu.replace("_MENU_",b)+"</label>";h('select option[value="'+a._iDisplayLength+'"]',i).attr("selected",!0);h("select",i).bind("change.DT",function(){var b=h(this).val(),i=a.aanFeatures.l;c=0;for(d=i.length;c<d;c++)i[c]!=this.parentNode&&h("select",i[c]).val(b);a._iDisplayLength=parseInt(b,10);y(a);if(a.fnDisplayEnd()==a.fnRecordsDisplay()){a._iDisplayStart=a.fnDisplayEnd()-a._iDisplayLength;if(a._iDisplayStart<
+0)a._iDisplayStart=0}if(a._iDisplayLength==-1)a._iDisplayStart=0;x(a)});h("select",i).attr("aria-controls",a.sTableId);return i}function y(a){a._iDisplayEnd=!1===a.oFeatures.bPaginate?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength>a.aiDisplay.length||-1==a._iDisplayLength?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength}function Da(a){if(a.oScroll.bInfinite)return null;var b=l.createElement("div");b.className=a.oClasses.sPaging+a.sPaginationType;j.ext.oPagination[a.sPaginationType].fnInit(a,
+b,function(a){y(a);x(a)});a.aanFeatures.p||a.aoDrawCallback.push({fn:function(a){j.ext.oPagination[a.sPaginationType].fnUpdate(a,function(a){y(a);x(a)})},sName:"pagination"});return b}function qa(a,b){var c=a._iDisplayStart;if("number"===typeof b)a._iDisplayStart=b*a._iDisplayLength,a._iDisplayStart>a.fnRecordsDisplay()&&(a._iDisplayStart=0);else if("first"==b)a._iDisplayStart=0;else if("previous"==b)a._iDisplayStart=0<=a._iDisplayLength?a._iDisplayStart-a._iDisplayLength:0,0>a._iDisplayStart&&(a._iDisplayStart=
+0);else if("next"==b)0<=a._iDisplayLength?a._iDisplayStart+a._iDisplayLength<a.fnRecordsDisplay()&&(a._iDisplayStart+=a._iDisplayLength):a._iDisplayStart=0;else if("last"==b)if(0<=a._iDisplayLength){var d=parseInt((a.fnRecordsDisplay()-1)/a._iDisplayLength,10)+1;a._iDisplayStart=(d-1)*a._iDisplayLength}else a._iDisplayStart=0;else D(a,0,"Unknown paging action: "+b);h(a.oInstance).trigger("page",a);return c!=a._iDisplayStart}function Aa(a){var b=l.createElement("div");a.aanFeatures.r||(b.id=a.sTableId+
+"_processing");b.innerHTML=a.oLanguage.sProcessing;b.className=a.oClasses.sProcessing;a.nTable.parentNode.insertBefore(b,a.nTable);return b}function E(a,b){if(a.oFeatures.bProcessing)for(var c=a.aanFeatures.r,d=0,i=c.length;d<i;d++)c[d].style.visibility=b?"visible":"hidden";h(a.oInstance).trigger("processing",[a,b])}function Ba(a){if(""===a.oScroll.sX&&""===a.oScroll.sY)return a.nTable;var b=l.createElement("div"),c=l.createElement("div"),d=l.createElement("div"),i=l.createElement("div"),f=l.createElement("div"),
+g=l.createElement("div"),e=a.nTable.cloneNode(!1),j=a.nTable.cloneNode(!1),o=a.nTable.getElementsByTagName("thead")[0],k=0===a.nTable.getElementsByTagName("tfoot").length?null:a.nTable.getElementsByTagName("tfoot")[0],m=a.oClasses;c.appendChild(d);f.appendChild(g);i.appendChild(a.nTable);b.appendChild(c);b.appendChild(i);d.appendChild(e);e.appendChild(o);null!==k&&(b.appendChild(f),g.appendChild(j),j.appendChild(k));b.className=m.sScrollWrapper;c.className=m.sScrollHead;d.className=m.sScrollHeadInner;
+i.className=m.sScrollBody;f.className=m.sScrollFoot;g.className=m.sScrollFootInner;a.oScroll.bAutoCss&&(c.style.overflow="hidden",c.style.position="relative",f.style.overflow="hidden",i.style.overflow="auto");c.style.border="0";c.style.width="100%";f.style.border="0";d.style.width=""!==a.oScroll.sXInner?a.oScroll.sXInner:"100%";e.removeAttribute("id");e.style.marginLeft="0";a.nTable.style.marginLeft="0";null!==k&&(j.removeAttribute("id"),j.style.marginLeft="0");d=h(a.nTable).children("caption");0<
+d.length&&(d=d[0],"top"===d._captionSide?e.appendChild(d):"bottom"===d._captionSide&&k&&j.appendChild(d));""!==a.oScroll.sX&&(c.style.width=q(a.oScroll.sX),i.style.width=q(a.oScroll.sX),null!==k&&(f.style.width=q(a.oScroll.sX)),h(i).scroll(function(){c.scrollLeft=this.scrollLeft;if(k!==null)f.scrollLeft=this.scrollLeft}));""!==a.oScroll.sY&&(i.style.height=q(a.oScroll.sY));a.aoDrawCallback.push({fn:La,sName:"scrolling"});a.oScroll.bInfinite&&h(i).scroll(function(){if(!a.bDrawing&&h(this).scrollTop()!==
+0&&h(this).scrollTop()+h(this).height()>h(a.nTable).height()-a.oScroll.iLoadGap&&a.fnDisplayEnd()<a.fnRecordsDisplay()){qa(a,"next");y(a);x(a)}});a.nScrollHead=c;a.nScrollFoot=f;return b}function La(a){var b=a.nScrollHead.getElementsByTagName("div")[0],c=b.getElementsByTagName("table")[0],d=a.nTable.parentNode,i,f,g,e,j,o,k,m,p=[],n=[],l=null!==a.nTFoot?a.nScrollFoot.getElementsByTagName("div")[0]:null,R=null!==a.nTFoot?l.getElementsByTagName("table")[0]:null,r=a.oBrowser.bScrollOversize,s=function(a){k=
+a.style;k.paddingTop="0";k.paddingBottom="0";k.borderTopWidth="0";k.borderBottomWidth="0";k.height=0};h(a.nTable).children("thead, tfoot").remove();i=h(a.nTHead).clone()[0];a.nTable.insertBefore(i,a.nTable.childNodes[0]);g=a.nTHead.getElementsByTagName("tr");e=i.getElementsByTagName("tr");null!==a.nTFoot&&(j=h(a.nTFoot).clone()[0],a.nTable.insertBefore(j,a.nTable.childNodes[1]),o=a.nTFoot.getElementsByTagName("tr"),j=j.getElementsByTagName("tr"));""===a.oScroll.sX&&(d.style.width="100%",b.parentNode.style.width=
+"100%");var t=N(a,i);i=0;for(f=t.length;i<f;i++)m=G(a,i),t[i].style.width=a.aoColumns[m].sWidth;null!==a.nTFoot&&C(function(a){a.style.width=""},j);a.oScroll.bCollapse&&""!==a.oScroll.sY&&(d.style.height=d.offsetHeight+a.nTHead.offsetHeight+"px");i=h(a.nTable).outerWidth();if(""===a.oScroll.sX){if(a.nTable.style.width="100%",r&&(h("tbody",d).height()>d.offsetHeight||"scroll"==h(d).css("overflow-y")))a.nTable.style.width=q(h(a.nTable).outerWidth()-a.oScroll.iBarWidth)}else""!==a.oScroll.sXInner?a.nTable.style.width=
+q(a.oScroll.sXInner):i==h(d).width()&&h(d).height()<h(a.nTable).height()?(a.nTable.style.width=q(i-a.oScroll.iBarWidth),h(a.nTable).outerWidth()>i-a.oScroll.iBarWidth&&(a.nTable.style.width=q(i))):a.nTable.style.width=q(i);i=h(a.nTable).outerWidth();C(s,e);C(function(a){p.push(q(h(a).width()))},e);C(function(a,b){a.style.width=p[b]},g);h(e).height(0);null!==a.nTFoot&&(C(s,j),C(function(a){n.push(q(h(a).width()))},j),C(function(a,b){a.style.width=n[b]},o),h(j).height(0));C(function(a,b){a.innerHTML=
+"";a.style.width=p[b]},e);null!==a.nTFoot&&C(function(a,b){a.innerHTML="";a.style.width=n[b]},j);if(h(a.nTable).outerWidth()<i){g=d.scrollHeight>d.offsetHeight||"scroll"==h(d).css("overflow-y")?i+a.oScroll.iBarWidth:i;if(r&&(d.scrollHeight>d.offsetHeight||"scroll"==h(d).css("overflow-y")))a.nTable.style.width=q(g-a.oScroll.iBarWidth);d.style.width=q(g);a.nScrollHead.style.width=q(g);null!==a.nTFoot&&(a.nScrollFoot.style.width=q(g));""===a.oScroll.sX?D(a,1,"The table cannot fit into the current element which will cause column misalignment. The table has been drawn at its minimum possible width."):
+""!==a.oScroll.sXInner&&D(a,1,"The table cannot fit into the current element which will cause column misalignment. Increase the sScrollXInner value or remove it to allow automatic calculation")}else d.style.width=q("100%"),a.nScrollHead.style.width=q("100%"),null!==a.nTFoot&&(a.nScrollFoot.style.width=q("100%"));""===a.oScroll.sY&&r&&(d.style.height=q(a.nTable.offsetHeight+a.oScroll.iBarWidth));""!==a.oScroll.sY&&a.oScroll.bCollapse&&(d.style.height=q(a.oScroll.sY),r=""!==a.oScroll.sX&&a.nTable.offsetWidth>
+d.offsetWidth?a.oScroll.iBarWidth:0,a.nTable.offsetHeight<d.offsetHeight&&(d.style.height=q(a.nTable.offsetHeight+r)));r=h(a.nTable).outerWidth();c.style.width=q(r);b.style.width=q(r);c=h(a.nTable).height()>d.clientHeight||"scroll"==h(d).css("overflow-y");b.style.paddingRight=c?a.oScroll.iBarWidth+"px":"0px";null!==a.nTFoot&&(R.style.width=q(r),l.style.width=q(r),l.style.paddingRight=c?a.oScroll.iBarWidth+"px":"0px");h(d).scroll();if(a.bSorted||a.bFiltered)d.scrollTop=0}function C(a,b,c){for(var d=
+0,i=0,f=b.length,g,e;i<f;){g=b[i].firstChild;for(e=c?c[i].firstChild:null;g;)1===g.nodeType&&(c?a(g,e,d):a(g,d),d++),g=g.nextSibling,e=c?e.nextSibling:null;i++}}function Ma(a,b){if(!a||null===a||""===a)return 0;b||(b=l.body);var c,d=l.createElement("div");d.style.width=q(a);b.appendChild(d);c=d.offsetWidth;b.removeChild(d);return c}function da(a){var b=0,c,d=0,i=a.aoColumns.length,f,e,j=h("th",a.nTHead),o=a.nTable.getAttribute("width");e=a.nTable.parentNode;for(f=0;f<i;f++)a.aoColumns[f].bVisible&&
+(d++,null!==a.aoColumns[f].sWidth&&(c=Ma(a.aoColumns[f].sWidthOrig,e),null!==c&&(a.aoColumns[f].sWidth=q(c)),b++));if(i==j.length&&0===b&&d==i&&""===a.oScroll.sX&&""===a.oScroll.sY)for(f=0;f<a.aoColumns.length;f++)c=h(j[f]).width(),null!==c&&(a.aoColumns[f].sWidth=q(c));else{b=a.nTable.cloneNode(!1);f=a.nTHead.cloneNode(!0);d=l.createElement("tbody");c=l.createElement("tr");b.removeAttribute("id");b.appendChild(f);null!==a.nTFoot&&(b.appendChild(a.nTFoot.cloneNode(!0)),C(function(a){a.style.width=
+""},b.getElementsByTagName("tr")));b.appendChild(d);d.appendChild(c);d=h("thead th",b);0===d.length&&(d=h("tbody tr:eq(0)>td",b));j=N(a,f);for(f=d=0;f<i;f++){var k=a.aoColumns[f];k.bVisible&&null!==k.sWidthOrig&&""!==k.sWidthOrig?j[f-d].style.width=q(k.sWidthOrig):k.bVisible?j[f-d].style.width="":d++}for(f=0;f<i;f++)a.aoColumns[f].bVisible&&(d=Na(a,f),null!==d&&(d=d.cloneNode(!0),""!==a.aoColumns[f].sContentPadding&&(d.innerHTML+=a.aoColumns[f].sContentPadding),c.appendChild(d)));e.appendChild(b);
+""!==a.oScroll.sX&&""!==a.oScroll.sXInner?b.style.width=q(a.oScroll.sXInner):""!==a.oScroll.sX?(b.style.width="",h(b).width()<e.offsetWidth&&(b.style.width=q(e.offsetWidth))):""!==a.oScroll.sY?b.style.width=q(e.offsetWidth):o&&(b.style.width=q(o));b.style.visibility="hidden";Oa(a,b);i=h("tbody tr:eq(0)",b).children();0===i.length&&(i=N(a,h("thead",b)[0]));if(""!==a.oScroll.sX){for(f=d=e=0;f<a.aoColumns.length;f++)a.aoColumns[f].bVisible&&(e=null===a.aoColumns[f].sWidthOrig?e+h(i[d]).outerWidth():
+e+(parseInt(a.aoColumns[f].sWidth.replace("px",""),10)+(h(i[d]).outerWidth()-h(i[d]).width())),d++);b.style.width=q(e);a.nTable.style.width=q(e)}for(f=d=0;f<a.aoColumns.length;f++)a.aoColumns[f].bVisible&&(e=h(i[d]).width(),null!==e&&0<e&&(a.aoColumns[f].sWidth=q(e)),d++);i=h(b).css("width");a.nTable.style.width=-1!==i.indexOf("%")?i:q(h(b).outerWidth());b.parentNode.removeChild(b)}o&&(a.nTable.style.width=q(o))}function Oa(a,b){""===a.oScroll.sX&&""!==a.oScroll.sY?(h(b).width(),b.style.width=q(h(b).outerWidth()-
+a.oScroll.iBarWidth)):""!==a.oScroll.sX&&(b.style.width=q(h(b).outerWidth()))}function Na(a,b){var c=Pa(a,b);if(0>c)return null;if(null===a.aoData[c].nTr){var d=l.createElement("td");d.innerHTML=v(a,c,b,"");return d}return J(a,c)[b]}function Pa(a,b){for(var c=-1,d=-1,i=0;i<a.aoData.length;i++){var e=v(a,i,b,"display")+"",e=e.replace(/<.*?>/g,"");e.length>c&&(c=e.length,d=i)}return d}function q(a){if(null===a)return"0px";if("number"==typeof a)return 0>a?"0px":a+"px";var b=a.charCodeAt(a.length-1);
+return 48>b||57<b?a:a+"px"}function Qa(){var a=l.createElement("p"),b=a.style;b.width="100%";b.height="200px";b.padding="0px";var c=l.createElement("div"),b=c.style;b.position="absolute";b.top="0px";b.left="0px";b.visibility="hidden";b.width="200px";b.height="150px";b.padding="0px";b.overflow="hidden";c.appendChild(a);l.body.appendChild(c);b=a.offsetWidth;c.style.overflow="scroll";a=a.offsetWidth;b==a&&(a=c.clientWidth);l.body.removeChild(c);return b-a}function O(a,b){var c,d,i,e,g,k,o=[],m=[],p=
+j.ext.oSort,l=a.aoData,q=a.aoColumns,G=a.oLanguage.oAria;if(!a.oFeatures.bServerSide&&(0!==a.aaSorting.length||null!==a.aaSortingFixed)){o=null!==a.aaSortingFixed?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(c=0;c<o.length;c++)if(d=o[c][0],i=R(a,d),e=a.aoColumns[d].sSortDataType,j.ext.afnSortData[e])if(g=j.ext.afnSortData[e].call(a.oInstance,a,d,i),g.length===l.length){i=0;for(e=l.length;i<e;i++)F(a,i,d,g[i])}else D(a,0,"Returned data sort array (col "+d+") is the wrong length");c=
+0;for(d=a.aiDisplayMaster.length;c<d;c++)m[a.aiDisplayMaster[c]]=c;var r=o.length,s;c=0;for(d=l.length;c<d;c++)for(i=0;i<r;i++){s=q[o[i][0]].aDataSort;g=0;for(k=s.length;g<k;g++)e=q[s[g]].sType,e=p[(e?e:"string")+"-pre"],l[c]._aSortData[s[g]]=e?e(v(a,c,s[g],"sort")):v(a,c,s[g],"sort")}a.aiDisplayMaster.sort(function(a,b){var c,d,e,i,f;for(c=0;c<r;c++){f=q[o[c][0]].aDataSort;d=0;for(e=f.length;d<e;d++)if(i=q[f[d]].sType,i=p[(i?i:"string")+"-"+o[c][1]](l[a]._aSortData[f[d]],l[b]._aSortData[f[d]]),0!==
+i)return i}return p["numeric-asc"](m[a],m[b])})}(b===n||b)&&!a.oFeatures.bDeferRender&&P(a);c=0;for(d=a.aoColumns.length;c<d;c++)e=q[c].sTitle.replace(/<.*?>/g,""),i=q[c].nTh,i.removeAttribute("aria-sort"),i.removeAttribute("aria-label"),q[c].bSortable?0<o.length&&o[0][0]==c?(i.setAttribute("aria-sort","asc"==o[0][1]?"ascending":"descending"),i.setAttribute("aria-label",e+("asc"==(q[c].asSorting[o[0][2]+1]?q[c].asSorting[o[0][2]+1]:q[c].asSorting[0])?G.sSortAscending:G.sSortDescending))):i.setAttribute("aria-label",
+e+("asc"==q[c].asSorting[0]?G.sSortAscending:G.sSortDescending)):i.setAttribute("aria-label",e);a.bSorted=!0;h(a.oInstance).trigger("sort",a);a.oFeatures.bFilter?K(a,a.oPreviousSearch,1):(a.aiDisplay=a.aiDisplayMaster.slice(),a._iDisplayStart=0,y(a),x(a))}function ia(a,b,c,d){Ra(b,{},function(b){if(!1!==a.aoColumns[c].bSortable){var e=function(){var d,e;if(b.shiftKey){for(var f=!1,h=0;h<a.aaSorting.length;h++)if(a.aaSorting[h][0]==c){f=!0;d=a.aaSorting[h][0];e=a.aaSorting[h][2]+1;a.aoColumns[d].asSorting[e]?
+(a.aaSorting[h][1]=a.aoColumns[d].asSorting[e],a.aaSorting[h][2]=e):a.aaSorting.splice(h,1);break}!1===f&&a.aaSorting.push([c,a.aoColumns[c].asSorting[0],0])}else 1==a.aaSorting.length&&a.aaSorting[0][0]==c?(d=a.aaSorting[0][0],e=a.aaSorting[0][2]+1,a.aoColumns[d].asSorting[e]||(e=0),a.aaSorting[0][1]=a.aoColumns[d].asSorting[e],a.aaSorting[0][2]=e):(a.aaSorting.splice(0,a.aaSorting.length),a.aaSorting.push([c,a.aoColumns[c].asSorting[0],0]));O(a)};a.oFeatures.bProcessing?(E(a,!0),setTimeout(function(){e();
+a.oFeatures.bServerSide||E(a,!1)},0)):e();"function"==typeof d&&d(a)}})}function P(a){var b,c,d,e,f,g=a.aoColumns.length,j=a.oClasses;for(b=0;b<g;b++)a.aoColumns[b].bSortable&&h(a.aoColumns[b].nTh).removeClass(j.sSortAsc+" "+j.sSortDesc+" "+a.aoColumns[b].sSortingClass);c=null!==a.aaSortingFixed?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable){f=a.aoColumns[b].sSortingClass;e=-1;for(d=0;d<c.length;d++)if(c[d][0]==b){f="asc"==c[d][1]?
+j.sSortAsc:j.sSortDesc;e=d;break}h(a.aoColumns[b].nTh).addClass(f);a.bJUI&&(f=h("span."+j.sSortIcon,a.aoColumns[b].nTh),f.removeClass(j.sSortJUIAsc+" "+j.sSortJUIDesc+" "+j.sSortJUI+" "+j.sSortJUIAscAllowed+" "+j.sSortJUIDescAllowed),f.addClass(-1==e?a.aoColumns[b].sSortingClassJUI:"asc"==c[e][1]?j.sSortJUIAsc:j.sSortJUIDesc))}else h(a.aoColumns[b].nTh).addClass(a.aoColumns[b].sSortingClass);f=j.sSortColumn;if(a.oFeatures.bSort&&a.oFeatures.bSortClasses){a=J(a);e=[];for(b=0;b<g;b++)e.push("");b=0;
+for(d=1;b<c.length;b++)j=parseInt(c[b][0],10),e[j]=f+d,3>d&&d++;f=RegExp(f+"[123]");var o;b=0;for(c=a.length;b<c;b++)j=b%g,d=a[b].className,o=e[j],j=d.replace(f,o),j!=d?a[b].className=h.trim(j):0<o.length&&-1==d.indexOf(o)&&(a[b].className=d+" "+o)}}function ra(a){if(a.oFeatures.bStateSave&&!a.bDestroying){var b,c;b=a.oScroll.bInfinite;var d={iCreate:(new Date).getTime(),iStart:b?0:a._iDisplayStart,iEnd:b?a._iDisplayLength:a._iDisplayEnd,iLength:a._iDisplayLength,aaSorting:h.extend(!0,[],a.aaSorting),
+oSearch:h.extend(!0,{},a.oPreviousSearch),aoSearchCols:h.extend(!0,[],a.aoPreSearchCols),abVisCols:[]};b=0;for(c=a.aoColumns.length;b<c;b++)d.abVisCols.push(a.aoColumns[b].bVisible);A(a,"aoStateSaveParams","stateSaveParams",[a,d]);a.fnStateSave.call(a.oInstance,a,d)}}function Sa(a,b){if(a.oFeatures.bStateSave){var c=a.fnStateLoad.call(a.oInstance,a);if(c){var d=A(a,"aoStateLoadParams","stateLoadParams",[a,c]);if(-1===h.inArray(!1,d)){a.oLoadedState=h.extend(!0,{},c);a._iDisplayStart=c.iStart;a.iInitDisplayStart=
+c.iStart;a._iDisplayEnd=c.iEnd;a._iDisplayLength=c.iLength;a.aaSorting=c.aaSorting.slice();a.saved_aaSorting=c.aaSorting.slice();h.extend(a.oPreviousSearch,c.oSearch);h.extend(!0,a.aoPreSearchCols,c.aoSearchCols);b.saved_aoColumns=[];for(d=0;d<c.abVisCols.length;d++)b.saved_aoColumns[d]={},b.saved_aoColumns[d].bVisible=c.abVisCols[d];A(a,"aoStateLoaded","stateLoaded",[a,c])}}}}function s(a){for(var b=0;b<j.settings.length;b++)if(j.settings[b].nTable===a)return j.settings[b];return null}function T(a){for(var b=
+[],a=a.aoData,c=0,d=a.length;c<d;c++)null!==a[c].nTr&&b.push(a[c].nTr);return b}function J(a,b){var c=[],d,e,f,g,h,j;e=0;var o=a.aoData.length;b!==n&&(e=b,o=b+1);for(f=e;f<o;f++)if(j=a.aoData[f],null!==j.nTr){e=[];for(d=j.nTr.firstChild;d;)g=d.nodeName.toLowerCase(),("td"==g||"th"==g)&&e.push(d),d=d.nextSibling;g=d=0;for(h=a.aoColumns.length;g<h;g++)a.aoColumns[g].bVisible?c.push(e[g-d]):(c.push(j._anHidden[g]),d++)}return c}function D(a,b,c){a=null===a?"DataTables warning: "+c:"DataTables warning (table id = '"+
+a.sTableId+"'): "+c;if(0===b)if("alert"==j.ext.sErrMode)alert(a);else throw Error(a);else X.console&&console.log&&console.log(a)}function p(a,b,c,d){d===n&&(d=c);b[c]!==n&&(a[d]=b[c])}function Ta(a,b){var c,d;for(d in b)b.hasOwnProperty(d)&&(c=b[d],"object"===typeof e[d]&&null!==c&&!1===h.isArray(c)?h.extend(!0,a[d],c):a[d]=c);return a}function Ra(a,b,c){h(a).bind("click.DT",b,function(b){a.blur();c(b)}).bind("keypress.DT",b,function(a){13===a.which&&c(a)}).bind("selectstart.DT",function(){return!1})}
+function z(a,b,c,d){c&&a[b].push({fn:c,sName:d})}function A(a,b,c,d){for(var b=a[b],e=[],f=b.length-1;0<=f;f--)e.push(b[f].fn.apply(a.oInstance,d));null!==c&&h(a.oInstance).trigger(c,d);return e}function Ua(a){var b=h('<div style="position:absolute; top:0; left:0; height:1px; width:1px; overflow:hidden"><div style="position:absolute; top:1px; left:1px; width:100px; overflow:scroll;"><div id="DT_BrowserTest" style="width:100%; height:10px;"></div></div></div>')[0];l.body.appendChild(b);a.oBrowser.bScrollOversize=
+100===h("#DT_BrowserTest",b)[0].offsetWidth?!0:!1;l.body.removeChild(b)}function Va(a){return function(){var b=[s(this[j.ext.iApiIndex])].concat(Array.prototype.slice.call(arguments));return j.ext.oApi[a].apply(this,b)}}var U=/\[.*?\]$/,Wa=X.JSON?JSON.stringify:function(a){var b=typeof a;if("object"!==b||null===a)return"string"===b&&(a='"'+a+'"'),a+"";var c,d,e=[],f=h.isArray(a);for(c in a)d=a[c],b=typeof d,"string"===b?d='"'+d+'"':"object"===b&&null!==d&&(d=Wa(d)),e.push((f?"":'"'+c+'":')+d);return(f?
+"[":"{")+e+(f?"]":"}")};this.$=function(a,b){var c,d,e=[],f;d=s(this[j.ext.iApiIndex]);var g=d.aoData,o=d.aiDisplay,k=d.aiDisplayMaster;b||(b={});b=h.extend({},{filter:"none",order:"current",page:"all"},b);if("current"==b.page){c=d._iDisplayStart;for(d=d.fnDisplayEnd();c<d;c++)(f=g[o[c]].nTr)&&e.push(f)}else if("current"==b.order&&"none"==b.filter){c=0;for(d=k.length;c<d;c++)(f=g[k[c]].nTr)&&e.push(f)}else if("current"==b.order&&"applied"==b.filter){c=0;for(d=o.length;c<d;c++)(f=g[o[c]].nTr)&&e.push(f)}else if("original"==
+b.order&&"none"==b.filter){c=0;for(d=g.length;c<d;c++)(f=g[c].nTr)&&e.push(f)}else if("original"==b.order&&"applied"==b.filter){c=0;for(d=g.length;c<d;c++)f=g[c].nTr,-1!==h.inArray(c,o)&&f&&e.push(f)}else D(d,1,"Unknown selection options");e=h(e);c=e.filter(a);e=e.find(a);return h([].concat(h.makeArray(c),h.makeArray(e)))};this._=function(a,b){var c=[],d,e,f=this.$(a,b);d=0;for(e=f.length;d<e;d++)c.push(this.fnGetData(f[d]));return c};this.fnAddData=function(a,b){if(0===a.length)return[];var c=[],
+d,e=s(this[j.ext.iApiIndex]);if("object"===typeof a[0]&&null!==a[0])for(var f=0;f<a.length;f++){d=H(e,a[f]);if(-1==d)return c;c.push(d)}else{d=H(e,a);if(-1==d)return c;c.push(d)}e.aiDisplay=e.aiDisplayMaster.slice();(b===n||b)&&aa(e);return c};this.fnAdjustColumnSizing=function(a){var b=s(this[j.ext.iApiIndex]);k(b);a===n||a?this.fnDraw(!1):(""!==b.oScroll.sX||""!==b.oScroll.sY)&&this.oApi._fnScrollDraw(b)};this.fnClearTable=function(a){var b=s(this[j.ext.iApiIndex]);ga(b);(a===n||a)&&x(b)};this.fnClose=
+function(a){for(var b=s(this[j.ext.iApiIndex]),c=0;c<b.aoOpenRows.length;c++)if(b.aoOpenRows[c].nParent==a)return(a=b.aoOpenRows[c].nTr.parentNode)&&a.removeChild(b.aoOpenRows[c].nTr),b.aoOpenRows.splice(c,1),0;return 1};this.fnDeleteRow=function(a,b,c){var d=s(this[j.ext.iApiIndex]),e,f,a="object"===typeof a?I(d,a):a,g=d.aoData.splice(a,1);e=0;for(f=d.aoData.length;e<f;e++)null!==d.aoData[e].nTr&&(d.aoData[e].nTr._DT_RowIndex=e);e=h.inArray(a,d.aiDisplay);d.asDataSearch.splice(e,1);ha(d.aiDisplayMaster,
+a);ha(d.aiDisplay,a);"function"===typeof b&&b.call(this,d,g);d._iDisplayStart>=d.fnRecordsDisplay()&&(d._iDisplayStart-=d._iDisplayLength,0>d._iDisplayStart&&(d._iDisplayStart=0));if(c===n||c)y(d),x(d);return g};this.fnDestroy=function(a){var b=s(this[j.ext.iApiIndex]),c=b.nTableWrapper.parentNode,d=b.nTBody,i,f,a=a===n?!1:a;b.bDestroying=!0;A(b,"aoDestroyCallback","destroy",[b]);if(!a){i=0;for(f=b.aoColumns.length;i<f;i++)!1===b.aoColumns[i].bVisible&&this.fnSetColumnVis(i,!0)}h(b.nTableWrapper).find("*").andSelf().unbind(".DT");
+h("tbody>tr>td."+b.oClasses.sRowEmpty,b.nTable).parent().remove();b.nTable!=b.nTHead.parentNode&&(h(b.nTable).children("thead").remove(),b.nTable.appendChild(b.nTHead));b.nTFoot&&b.nTable!=b.nTFoot.parentNode&&(h(b.nTable).children("tfoot").remove(),b.nTable.appendChild(b.nTFoot));b.nTable.parentNode.removeChild(b.nTable);h(b.nTableWrapper).remove();b.aaSorting=[];b.aaSortingFixed=[];P(b);h(T(b)).removeClass(b.asStripeClasses.join(" "));h("th, td",b.nTHead).removeClass([b.oClasses.sSortable,b.oClasses.sSortableAsc,
+b.oClasses.sSortableDesc,b.oClasses.sSortableNone].join(" "));b.bJUI&&(h("th span."+b.oClasses.sSortIcon+", td span."+b.oClasses.sSortIcon,b.nTHead).remove(),h("th, td",b.nTHead).each(function(){var a=h("div."+b.oClasses.sSortJUIWrapper,this),c=a.contents();h(this).append(c);a.remove()}));!a&&b.nTableReinsertBefore?c.insertBefore(b.nTable,b.nTableReinsertBefore):a||c.appendChild(b.nTable);i=0;for(f=b.aoData.length;i<f;i++)null!==b.aoData[i].nTr&&d.appendChild(b.aoData[i].nTr);!0===b.oFeatures.bAutoWidth&&
+(b.nTable.style.width=q(b.sDestroyWidth));if(f=b.asDestroyStripes.length){a=h(d).children("tr");for(i=0;i<f;i++)a.filter(":nth-child("+f+"n + "+i+")").addClass(b.asDestroyStripes[i])}i=0;for(f=j.settings.length;i<f;i++)j.settings[i]==b&&j.settings.splice(i,1);e=b=null};this.fnDraw=function(a){var b=s(this[j.ext.iApiIndex]);!1===a?(y(b),x(b)):aa(b)};this.fnFilter=function(a,b,c,d,e,f){var g=s(this[j.ext.iApiIndex]);if(g.oFeatures.bFilter){if(c===n||null===c)c=!1;if(d===n||null===d)d=!0;if(e===n||null===
+e)e=!0;if(f===n||null===f)f=!0;if(b===n||null===b){if(K(g,{sSearch:a+"",bRegex:c,bSmart:d,bCaseInsensitive:f},1),e&&g.aanFeatures.f){b=g.aanFeatures.f;c=0;for(d=b.length;c<d;c++)try{b[c]._DT_Input!=l.activeElement&&h(b[c]._DT_Input).val(a)}catch(o){h(b[c]._DT_Input).val(a)}}}else h.extend(g.aoPreSearchCols[b],{sSearch:a+"",bRegex:c,bSmart:d,bCaseInsensitive:f}),K(g,g.oPreviousSearch,1)}};this.fnGetData=function(a,b){var c=s(this[j.ext.iApiIndex]);if(a!==n){var d=a;if("object"===typeof a){var e=a.nodeName.toLowerCase();
+"tr"===e?d=I(c,a):"td"===e&&(d=I(c,a.parentNode),b=fa(c,d,a))}return b!==n?v(c,d,b,""):c.aoData[d]!==n?c.aoData[d]._aData:null}return Z(c)};this.fnGetNodes=function(a){var b=s(this[j.ext.iApiIndex]);return a!==n?b.aoData[a]!==n?b.aoData[a].nTr:null:T(b)};this.fnGetPosition=function(a){var b=s(this[j.ext.iApiIndex]),c=a.nodeName.toUpperCase();return"TR"==c?I(b,a):"TD"==c||"TH"==c?(c=I(b,a.parentNode),a=fa(b,c,a),[c,R(b,a),a]):null};this.fnIsOpen=function(a){for(var b=s(this[j.ext.iApiIndex]),c=0;c<
+b.aoOpenRows.length;c++)if(b.aoOpenRows[c].nParent==a)return!0;return!1};this.fnOpen=function(a,b,c){var d=s(this[j.ext.iApiIndex]),e=T(d);if(-1!==h.inArray(a,e)){this.fnClose(a);var e=l.createElement("tr"),f=l.createElement("td");e.appendChild(f);f.className=c;f.colSpan=t(d);"string"===typeof b?f.innerHTML=b:h(f).html(b);b=h("tr",d.nTBody);-1!=h.inArray(a,b)&&h(e).insertAfter(a);d.aoOpenRows.push({nTr:e,nParent:a});return e}};this.fnPageChange=function(a,b){var c=s(this[j.ext.iApiIndex]);qa(c,a);
+y(c);(b===n||b)&&x(c)};this.fnSetColumnVis=function(a,b,c){var d=s(this[j.ext.iApiIndex]),e,f,g=d.aoColumns,h=d.aoData,o,m;if(g[a].bVisible!=b){if(b){for(e=f=0;e<a;e++)g[e].bVisible&&f++;m=f>=t(d);if(!m)for(e=a;e<g.length;e++)if(g[e].bVisible){o=e;break}e=0;for(f=h.length;e<f;e++)null!==h[e].nTr&&(m?h[e].nTr.appendChild(h[e]._anHidden[a]):h[e].nTr.insertBefore(h[e]._anHidden[a],J(d,e)[o]))}else{e=0;for(f=h.length;e<f;e++)null!==h[e].nTr&&(o=J(d,e)[a],h[e]._anHidden[a]=o,o.parentNode.removeChild(o))}g[a].bVisible=
+b;W(d,d.aoHeader);d.nTFoot&&W(d,d.aoFooter);e=0;for(f=d.aoOpenRows.length;e<f;e++)d.aoOpenRows[e].nTr.colSpan=t(d);if(c===n||c)k(d),x(d);ra(d)}};this.fnSettings=function(){return s(this[j.ext.iApiIndex])};this.fnSort=function(a){var b=s(this[j.ext.iApiIndex]);b.aaSorting=a;O(b)};this.fnSortListener=function(a,b,c){ia(s(this[j.ext.iApiIndex]),a,b,c)};this.fnUpdate=function(a,b,c,d,e){var f=s(this[j.ext.iApiIndex]),b="object"===typeof b?I(f,b):b;if(h.isArray(a)&&c===n){f.aoData[b]._aData=a.slice();
+for(c=0;c<f.aoColumns.length;c++)this.fnUpdate(v(f,b,c),b,c,!1,!1)}else if(h.isPlainObject(a)&&c===n){f.aoData[b]._aData=h.extend(!0,{},a);for(c=0;c<f.aoColumns.length;c++)this.fnUpdate(v(f,b,c),b,c,!1,!1)}else{F(f,b,c,a);var a=v(f,b,c,"display"),g=f.aoColumns[c];null!==g.fnRender&&(a=S(f,b,c),g.bUseRendered&&F(f,b,c,a));null!==f.aoData[b].nTr&&(J(f,b)[c].innerHTML=a)}c=h.inArray(b,f.aiDisplay);f.asDataSearch[c]=na(f,Y(f,b,"filter",r(f,"bSearchable")));(e===n||e)&&k(f);(d===n||d)&&aa(f);return 0};
+this.fnVersionCheck=j.ext.fnVersionCheck;this.oApi={_fnExternApiFunc:Va,_fnInitialise:ba,_fnInitComplete:$,_fnLanguageCompat:pa,_fnAddColumn:o,_fnColumnOptions:m,_fnAddData:H,_fnCreateTr:ea,_fnGatherData:ua,_fnBuildHead:va,_fnDrawHead:W,_fnDraw:x,_fnReDraw:aa,_fnAjaxUpdate:wa,_fnAjaxParameters:Ea,_fnAjaxUpdateDraw:Fa,_fnServerParams:ka,_fnAddOptionsHtml:xa,_fnFeatureHtmlTable:Ba,_fnScrollDraw:La,_fnAdjustColumnSizing:k,_fnFeatureHtmlFilter:za,_fnFilterComplete:K,_fnFilterCustom:Ia,_fnFilterColumn:Ha,
+_fnFilter:Ga,_fnBuildSearchArray:la,_fnBuildSearchRow:na,_fnFilterCreateSearch:ma,_fnDataToSearch:Ja,_fnSort:O,_fnSortAttachListener:ia,_fnSortingClasses:P,_fnFeatureHtmlPaginate:Da,_fnPageChange:qa,_fnFeatureHtmlInfo:Ca,_fnUpdateInfo:Ka,_fnFeatureHtmlLength:ya,_fnFeatureHtmlProcessing:Aa,_fnProcessingDisplay:E,_fnVisibleToColumnIndex:G,_fnColumnIndexToVisible:R,_fnNodeToDataIndex:I,_fnVisbleColumns:t,_fnCalculateEnd:y,_fnConvertToWidth:Ma,_fnCalculateColumnWidths:da,_fnScrollingWidthAdjust:Oa,_fnGetWidestNode:Na,
+_fnGetMaxLenString:Pa,_fnStringToCss:q,_fnDetectType:B,_fnSettingsFromNode:s,_fnGetDataMaster:Z,_fnGetTrNodes:T,_fnGetTdNodes:J,_fnEscapeRegex:oa,_fnDeleteIndex:ha,_fnReOrderIndex:u,_fnColumnOrdering:M,_fnLog:D,_fnClearTable:ga,_fnSaveState:ra,_fnLoadState:Sa,_fnCreateCookie:function(a,b,c,d,e){var f=new Date;f.setTime(f.getTime()+1E3*c);var c=X.location.pathname.split("/"),a=a+"_"+c.pop().replace(/[\/:]/g,"").toLowerCase(),g;null!==e?(g="function"===typeof h.parseJSON?h.parseJSON(b):eval("("+b+")"),
+b=e(a,g,f.toGMTString(),c.join("/")+"/")):b=a+"="+encodeURIComponent(b)+"; expires="+f.toGMTString()+"; path="+c.join("/")+"/";a=l.cookie.split(";");e=b.split(";")[0].length;f=[];if(4096<e+l.cookie.length+10){for(var j=0,o=a.length;j<o;j++)if(-1!=a[j].indexOf(d)){var k=a[j].split("=");try{(g=eval("("+decodeURIComponent(k[1])+")"))&&g.iCreate&&f.push({name:k[0],time:g.iCreate})}catch(m){}}for(f.sort(function(a,b){return b.time-a.time});4096<e+l.cookie.length+10;){if(0===f.length)return;d=f.pop();l.cookie=
+d.name+"=; expires=Thu, 01-Jan-1970 00:00:01 GMT; path="+c.join("/")+"/"}}l.cookie=b},_fnReadCookie:function(a){for(var b=X.location.pathname.split("/"),a=a+"_"+b[b.length-1].replace(/[\/:]/g,"").toLowerCase()+"=",b=l.cookie.split(";"),c=0;c<b.length;c++){for(var d=b[c];" "==d.charAt(0);)d=d.substring(1,d.length);if(0===d.indexOf(a))return decodeURIComponent(d.substring(a.length,d.length))}return null},_fnDetectHeader:V,_fnGetUniqueThs:N,_fnScrollBarWidth:Qa,_fnApplyToChildren:C,_fnMap:p,_fnGetRowData:Y,
+_fnGetCellData:v,_fnSetCellData:F,_fnGetObjectDataFn:Q,_fnSetObjectDataFn:L,_fnApplyColumnDefs:ta,_fnBindAction:Ra,_fnExtend:Ta,_fnCallbackReg:z,_fnCallbackFire:A,_fnJsonString:Wa,_fnRender:S,_fnNodeToColumnIndex:fa,_fnInfoMacros:ja,_fnBrowserDetect:Ua,_fnGetColumns:r};h.extend(j.ext.oApi,this.oApi);for(var sa in j.ext.oApi)sa&&(this[sa]=Va(sa));var ca=this;this.each(function(){var a=0,b,c,d;c=this.getAttribute("id");var i=!1,f=!1;if("table"!=this.nodeName.toLowerCase())D(null,0,"Attempted to initialise DataTables on a node which is not a table: "+
+this.nodeName);else{a=0;for(b=j.settings.length;a<b;a++){if(j.settings[a].nTable==this){if(e===n||e.bRetrieve)return j.settings[a].oInstance;if(e.bDestroy){j.settings[a].oInstance.fnDestroy();break}else{D(j.settings[a],0,"Cannot reinitialise DataTable.\n\nTo retrieve the DataTables object for this table, pass no arguments or see the docs for bRetrieve and bDestroy");return}}if(j.settings[a].sTableId==this.id){j.settings.splice(a,1);break}}if(null===c||""===c)this.id=c="DataTables_Table_"+j.ext._oExternConfig.iNextUnique++;
+var g=h.extend(!0,{},j.models.oSettings,{nTable:this,oApi:ca.oApi,oInit:e,sDestroyWidth:h(this).width(),sInstance:c,sTableId:c});j.settings.push(g);g.oInstance=1===ca.length?ca:h(this).dataTable();e||(e={});e.oLanguage&&pa(e.oLanguage);e=Ta(h.extend(!0,{},j.defaults),e);p(g.oFeatures,e,"bPaginate");p(g.oFeatures,e,"bLengthChange");p(g.oFeatures,e,"bFilter");p(g.oFeatures,e,"bSort");p(g.oFeatures,e,"bInfo");p(g.oFeatures,e,"bProcessing");p(g.oFeatures,e,"bAutoWidth");p(g.oFeatures,e,"bSortClasses");
+p(g.oFeatures,e,"bServerSide");p(g.oFeatures,e,"bDeferRender");p(g.oScroll,e,"sScrollX","sX");p(g.oScroll,e,"sScrollXInner","sXInner");p(g.oScroll,e,"sScrollY","sY");p(g.oScroll,e,"bScrollCollapse","bCollapse");p(g.oScroll,e,"bScrollInfinite","bInfinite");p(g.oScroll,e,"iScrollLoadGap","iLoadGap");p(g.oScroll,e,"bScrollAutoCss","bAutoCss");p(g,e,"asStripeClasses");p(g,e,"asStripClasses","asStripeClasses");p(g,e,"fnServerData");p(g,e,"fnFormatNumber");p(g,e,"sServerMethod");p(g,e,"aaSorting");p(g,
+e,"aaSortingFixed");p(g,e,"aLengthMenu");p(g,e,"sPaginationType");p(g,e,"sAjaxSource");p(g,e,"sAjaxDataProp");p(g,e,"iCookieDuration");p(g,e,"sCookiePrefix");p(g,e,"sDom");p(g,e,"bSortCellsTop");p(g,e,"iTabIndex");p(g,e,"oSearch","oPreviousSearch");p(g,e,"aoSearchCols","aoPreSearchCols");p(g,e,"iDisplayLength","_iDisplayLength");p(g,e,"bJQueryUI","bJUI");p(g,e,"fnCookieCallback");p(g,e,"fnStateLoad");p(g,e,"fnStateSave");p(g.oLanguage,e,"fnInfoCallback");z(g,"aoDrawCallback",e.fnDrawCallback,"user");
+z(g,"aoServerParams",e.fnServerParams,"user");z(g,"aoStateSaveParams",e.fnStateSaveParams,"user");z(g,"aoStateLoadParams",e.fnStateLoadParams,"user");z(g,"aoStateLoaded",e.fnStateLoaded,"user");z(g,"aoRowCallback",e.fnRowCallback,"user");z(g,"aoRowCreatedCallback",e.fnCreatedRow,"user");z(g,"aoHeaderCallback",e.fnHeaderCallback,"user");z(g,"aoFooterCallback",e.fnFooterCallback,"user");z(g,"aoInitComplete",e.fnInitComplete,"user");z(g,"aoPreDrawCallback",e.fnPreDrawCallback,"user");g.oFeatures.bServerSide&&
+g.oFeatures.bSort&&g.oFeatures.bSortClasses?z(g,"aoDrawCallback",P,"server_side_sort_classes"):g.oFeatures.bDeferRender&&z(g,"aoDrawCallback",P,"defer_sort_classes");e.bJQueryUI?(h.extend(g.oClasses,j.ext.oJUIClasses),e.sDom===j.defaults.sDom&&"lfrtip"===j.defaults.sDom&&(g.sDom='<"H"lfr>t<"F"ip>')):h.extend(g.oClasses,j.ext.oStdClasses);h(this).addClass(g.oClasses.sTable);if(""!==g.oScroll.sX||""!==g.oScroll.sY)g.oScroll.iBarWidth=Qa();g.iInitDisplayStart===n&&(g.iInitDisplayStart=e.iDisplayStart,
+g._iDisplayStart=e.iDisplayStart);e.bStateSave&&(g.oFeatures.bStateSave=!0,Sa(g,e),z(g,"aoDrawCallback",ra,"state_save"));null!==e.iDeferLoading&&(g.bDeferLoading=!0,a=h.isArray(e.iDeferLoading),g._iRecordsDisplay=a?e.iDeferLoading[0]:e.iDeferLoading,g._iRecordsTotal=a?e.iDeferLoading[1]:e.iDeferLoading);null!==e.aaData&&(f=!0);""!==e.oLanguage.sUrl?(g.oLanguage.sUrl=e.oLanguage.sUrl,h.getJSON(g.oLanguage.sUrl,null,function(a){pa(a);h.extend(true,g.oLanguage,e.oLanguage,a);ba(g)}),i=!0):h.extend(!0,
+g.oLanguage,e.oLanguage);null===e.asStripeClasses&&(g.asStripeClasses=[g.oClasses.sStripeOdd,g.oClasses.sStripeEven]);b=g.asStripeClasses.length;g.asDestroyStripes=[];if(b){c=!1;d=h(this).children("tbody").children("tr:lt("+b+")");for(a=0;a<b;a++)d.hasClass(g.asStripeClasses[a])&&(c=!0,g.asDestroyStripes.push(g.asStripeClasses[a]));c&&d.removeClass(g.asStripeClasses.join(" "))}c=[];a=this.getElementsByTagName("thead");0!==a.length&&(V(g.aoHeader,a[0]),c=N(g));if(null===e.aoColumns){d=[];a=0;for(b=
+c.length;a<b;a++)d.push(null)}else d=e.aoColumns;a=0;for(b=d.length;a<b;a++)e.saved_aoColumns!==n&&e.saved_aoColumns.length==b&&(null===d[a]&&(d[a]={}),d[a].bVisible=e.saved_aoColumns[a].bVisible),o(g,c?c[a]:null);ta(g,e.aoColumnDefs,d,function(a,b){m(g,a,b)});a=0;for(b=g.aaSorting.length;a<b;a++){g.aaSorting[a][0]>=g.aoColumns.length&&(g.aaSorting[a][0]=0);var k=g.aoColumns[g.aaSorting[a][0]];g.aaSorting[a][2]===n&&(g.aaSorting[a][2]=0);e.aaSorting===n&&g.saved_aaSorting===n&&(g.aaSorting[a][1]=
+k.asSorting[0]);c=0;for(d=k.asSorting.length;c<d;c++)if(g.aaSorting[a][1]==k.asSorting[c]){g.aaSorting[a][2]=c;break}}P(g);Ua(g);a=h(this).children("caption").each(function(){this._captionSide=h(this).css("caption-side")});b=h(this).children("thead");0===b.length&&(b=[l.createElement("thead")],this.appendChild(b[0]));g.nTHead=b[0];b=h(this).children("tbody");0===b.length&&(b=[l.createElement("tbody")],this.appendChild(b[0]));g.nTBody=b[0];g.nTBody.setAttribute("role","alert");g.nTBody.setAttribute("aria-live",
+"polite");g.nTBody.setAttribute("aria-relevant","all");b=h(this).children("tfoot");if(0===b.length&&0<a.length&&(""!==g.oScroll.sX||""!==g.oScroll.sY))b=[l.createElement("tfoot")],this.appendChild(b[0]);0<b.length&&(g.nTFoot=b[0],V(g.aoFooter,g.nTFoot));if(f)for(a=0;a<e.aaData.length;a++)H(g,e.aaData[a]);else ua(g);g.aiDisplay=g.aiDisplayMaster.slice();g.bInitialised=!0;!1===i&&ba(g)}});ca=null;return this};j.fnVersionCheck=function(e){for(var h=function(e,h){for(;e.length<h;)e+="0";return e},m=j.ext.sVersion.split("."),
+e=e.split("."),k="",n="",l=0,t=e.length;l<t;l++)k+=h(m[l],3),n+=h(e[l],3);return parseInt(k,10)>=parseInt(n,10)};j.fnIsDataTable=function(e){for(var h=j.settings,m=0;m<h.length;m++)if(h[m].nTable===e||h[m].nScrollHead===e||h[m].nScrollFoot===e)return!0;return!1};j.fnTables=function(e){var o=[];jQuery.each(j.settings,function(j,k){(!e||!0===e&&h(k.nTable).is(":visible"))&&o.push(k.nTable)});return o};j.version="1.9.4";j.settings=[];j.models={};j.models.ext={afnFiltering:[],afnSortData:[],aoFeatures:[],
+aTypes:[],fnVersionCheck:j.fnVersionCheck,iApiIndex:0,ofnSearch:{},oApi:{},oStdClasses:{},oJUIClasses:{},oPagination:{},oSort:{},sVersion:j.version,sErrMode:"alert",_oExternConfig:{iNextUnique:0}};j.models.oSearch={bCaseInsensitive:!0,sSearch:"",bRegex:!1,bSmart:!0};j.models.oRow={nTr:null,_aData:[],_aSortData:[],_anHidden:[],_sRowStripe:""};j.models.oColumn={aDataSort:null,asSorting:null,bSearchable:null,bSortable:null,bUseRendered:null,bVisible:null,_bAutoType:!0,fnCreatedCell:null,fnGetData:null,
+fnRender:null,fnSetData:null,mData:null,mRender:null,nTh:null,nTf:null,sClass:null,sContentPadding:null,sDefaultContent:null,sName:null,sSortDataType:"std",sSortingClass:null,sSortingClassJUI:null,sTitle:null,sType:null,sWidth:null,sWidthOrig:null};j.defaults={aaData:null,aaSorting:[[0,"asc"]],aaSortingFixed:null,aLengthMenu:[10,25,50,100],aoColumns:null,aoColumnDefs:null,aoSearchCols:[],asStripeClasses:null,bAutoWidth:!0,bDeferRender:!1,bDestroy:!1,bFilter:!0,bInfo:!0,bJQueryUI:!1,bLengthChange:!0,
+bPaginate:!0,bProcessing:!1,bRetrieve:!1,bScrollAutoCss:!0,bScrollCollapse:!1,bScrollInfinite:!1,bServerSide:!1,bSort:!0,bSortCellsTop:!1,bSortClasses:!0,bStateSave:!1,fnCookieCallback:null,fnCreatedRow:null,fnDrawCallback:null,fnFooterCallback:null,fnFormatNumber:function(e){if(1E3>e)return e;for(var h=e+"",e=h.split(""),j="",h=h.length,k=0;k<h;k++)0===k%3&&0!==k&&(j=this.oLanguage.sInfoThousands+j),j=e[h-k-1]+j;return j},fnHeaderCallback:null,fnInfoCallback:null,fnInitComplete:null,fnPreDrawCallback:null,
+fnRowCallback:null,fnServerData:function(e,j,m,k){k.jqXHR=h.ajax({url:e,data:j,success:function(e){e.sError&&k.oApi._fnLog(k,0,e.sError);h(k.oInstance).trigger("xhr",[k,e]);m(e)},dataType:"json",cache:!1,type:k.sServerMethod,error:function(e,h){"parsererror"==h&&k.oApi._fnLog(k,0,"DataTables warning: JSON data from server could not be parsed. This is caused by a JSON formatting error.")}})},fnServerParams:null,fnStateLoad:function(e){var e=this.oApi._fnReadCookie(e.sCookiePrefix+e.sInstance),j;try{j=
+"function"===typeof h.parseJSON?h.parseJSON(e):eval("("+e+")")}catch(m){j=null}return j},fnStateLoadParams:null,fnStateLoaded:null,fnStateSave:function(e,h){this.oApi._fnCreateCookie(e.sCookiePrefix+e.sInstance,this.oApi._fnJsonString(h),e.iCookieDuration,e.sCookiePrefix,e.fnCookieCallback)},fnStateSaveParams:null,iCookieDuration:7200,iDeferLoading:null,iDisplayLength:10,iDisplayStart:0,iScrollLoadGap:100,iTabIndex:0,oLanguage:{oAria:{sSortAscending:": activate to sort column ascending",sSortDescending:": activate to sort column descending"},
+oPaginate:{sFirst:"First",sLast:"Last",sNext:"Next",sPrevious:"Previous"},sEmptyTable:"No data available in table",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sInfoThousands:",",sLengthMenu:"Show _MENU_ entries",sLoadingRecords:"Loading...",sProcessing:"Processing...",sSearch:"Search:",sUrl:"",sZeroRecords:"No matching records found"},oSearch:h.extend({},j.models.oSearch),sAjaxDataProp:"aaData",
+sAjaxSource:null,sCookiePrefix:"SpryMedia_DataTables_",sDom:"lfrtip",sPaginationType:"two_button",sScrollX:"",sScrollXInner:"",sScrollY:"",sServerMethod:"GET"};j.defaults.columns={aDataSort:null,asSorting:["asc","desc"],bSearchable:!0,bSortable:!0,bUseRendered:!0,bVisible:!0,fnCreatedCell:null,fnRender:null,iDataSort:-1,mData:null,mRender:null,sCellType:"td",sClass:"",sContentPadding:"",sDefaultContent:null,sName:"",sSortDataType:"std",sTitle:null,sType:null,sWidth:null};j.models.oSettings={oFeatures:{bAutoWidth:null,
+bDeferRender:null,bFilter:null,bInfo:null,bLengthChange:null,bPaginate:null,bProcessing:null,bServerSide:null,bSort:null,bSortClasses:null,bStateSave:null},oScroll:{bAutoCss:null,bCollapse:null,bInfinite:null,iBarWidth:0,iLoadGap:null,sX:null,sXInner:null,sY:null},oLanguage:{fnInfoCallback:null},oBrowser:{bScrollOversize:!1},aanFeatures:[],aoData:[],aiDisplay:[],aiDisplayMaster:[],aoColumns:[],aoHeader:[],aoFooter:[],asDataSearch:[],oPreviousSearch:{},aoPreSearchCols:[],aaSorting:null,aaSortingFixed:null,
+asStripeClasses:null,asDestroyStripes:[],sDestroyWidth:0,aoRowCallback:[],aoHeaderCallback:[],aoFooterCallback:[],aoDrawCallback:[],aoRowCreatedCallback:[],aoPreDrawCallback:[],aoInitComplete:[],aoStateSaveParams:[],aoStateLoadParams:[],aoStateLoaded:[],sTableId:"",nTable:null,nTHead:null,nTFoot:null,nTBody:null,nTableWrapper:null,bDeferLoading:!1,bInitialised:!1,aoOpenRows:[],sDom:null,sPaginationType:"two_button",iCookieDuration:0,sCookiePrefix:"",fnCookieCallback:null,aoStateSave:[],aoStateLoad:[],
+oLoadedState:null,sAjaxSource:null,sAjaxDataProp:null,bAjaxDataGet:!0,jqXHR:null,fnServerData:null,aoServerParams:[],sServerMethod:null,fnFormatNumber:null,aLengthMenu:null,iDraw:0,bDrawing:!1,iDrawError:-1,_iDisplayLength:10,_iDisplayStart:0,_iDisplayEnd:10,_iRecordsTotal:0,_iRecordsDisplay:0,bJUI:null,oClasses:{},bFiltered:!1,bSorted:!1,bSortCellsTop:null,oInit:null,aoDestroyCallback:[],fnRecordsTotal:function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsTotal,10):this.aiDisplayMaster.length},
+fnRecordsDisplay:function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsDisplay,10):this.aiDisplay.length},fnDisplayEnd:function(){return this.oFeatures.bServerSide?!1===this.oFeatures.bPaginate||-1==this._iDisplayLength?this._iDisplayStart+this.aiDisplay.length:Math.min(this._iDisplayStart+this._iDisplayLength,this._iRecordsDisplay):this._iDisplayEnd},oInstance:null,sInstance:null,iTabIndex:0,nScrollHead:null,nScrollFoot:null};j.ext=h.extend(!0,{},j.models.ext);h.extend(j.ext.oStdClasses,
+{sTable:"dataTable",sPagePrevEnabled:"paginate_enabled_previous",sPagePrevDisabled:"paginate_disabled_previous",sPageNextEnabled:"paginate_enabled_next",sPageNextDisabled:"paginate_disabled_next",sPageJUINext:"",sPageJUIPrev:"",sPageButton:"paginate_button",sPageButtonActive:"paginate_active",sPageButtonStaticDisabled:"paginate_button paginate_button_disabled",sPageFirst:"first",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last",sStripeOdd:"odd",sStripeEven:"even",sRowEmpty:"dataTables_empty",
+sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",
+sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:"",sJUIHeader:"",sJUIFooter:""});h.extend(j.ext.oJUIClasses,j.ext.oStdClasses,{sPagePrevEnabled:"fg-button ui-button ui-state-default ui-corner-left",sPagePrevDisabled:"fg-button ui-button ui-state-default ui-corner-left ui-state-disabled",sPageNextEnabled:"fg-button ui-button ui-state-default ui-corner-right",
+sPageNextDisabled:"fg-button ui-button ui-state-default ui-corner-right ui-state-disabled",sPageJUINext:"ui-icon ui-icon-circle-arrow-e",sPageJUIPrev:"ui-icon ui-icon-circle-arrow-w",sPageButton:"fg-button ui-button ui-state-default",sPageButtonActive:"fg-button ui-button ui-state-default ui-state-disabled",sPageButtonStaticDisabled:"fg-button ui-button ui-state-default ui-state-disabled",sPageFirst:"first ui-corner-tl ui-corner-bl",sPageLast:"last ui-corner-tr ui-corner-br",sPaging:"dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi paging_",
+sSortAsc:"ui-state-default",sSortDesc:"ui-state-default",sSortable:"ui-state-default",sSortableAsc:"ui-state-default",sSortableDesc:"ui-state-default",sSortableNone:"ui-state-default",sSortJUIAsc:"css_right ui-icon ui-icon-triangle-1-n",sSortJUIDesc:"css_right ui-icon ui-icon-triangle-1-s",sSortJUI:"css_right ui-icon ui-icon-carat-2-n-s",sSortJUIAscAllowed:"css_right ui-icon ui-icon-carat-1-n",sSortJUIDescAllowed:"css_right ui-icon ui-icon-carat-1-s",sSortJUIWrapper:"DataTables_sort_wrapper",sSortIcon:"DataTables_sort_icon",
+sScrollHead:"dataTables_scrollHead ui-state-default",sScrollFoot:"dataTables_scrollFoot ui-state-default",sFooterTH:"ui-state-default",sJUIHeader:"fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix",sJUIFooter:"fg-toolbar ui-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix"});h.extend(j.ext.oPagination,{two_button:{fnInit:function(e,j,m){var k=e.oLanguage.oPaginate,n=function(h){e.oApi._fnPageChange(e,h.data.action)&&m(e)},k=!e.bJUI?'<a class="'+
+e.oClasses.sPagePrevDisabled+'" tabindex="'+e.iTabIndex+'" role="button">'+k.sPrevious+'</a><a class="'+e.oClasses.sPageNextDisabled+'" tabindex="'+e.iTabIndex+'" role="button">'+k.sNext+"</a>":'<a class="'+e.oClasses.sPagePrevDisabled+'" tabindex="'+e.iTabIndex+'" role="button"><span class="'+e.oClasses.sPageJUIPrev+'"></span></a><a class="'+e.oClasses.sPageNextDisabled+'" tabindex="'+e.iTabIndex+'" role="button"><span class="'+e.oClasses.sPageJUINext+'"></span></a>';h(j).append(k);var l=h("a",j),
+k=l[0],l=l[1];e.oApi._fnBindAction(k,{action:"previous"},n);e.oApi._fnBindAction(l,{action:"next"},n);e.aanFeatures.p||(j.id=e.sTableId+"_paginate",k.id=e.sTableId+"_previous",l.id=e.sTableId+"_next",k.setAttribute("aria-controls",e.sTableId),l.setAttribute("aria-controls",e.sTableId))},fnUpdate:function(e){if(e.aanFeatures.p)for(var h=e.oClasses,j=e.aanFeatures.p,k,l=0,n=j.length;l<n;l++)if(k=j[l].firstChild)k.className=0===e._iDisplayStart?h.sPagePrevDisabled:h.sPagePrevEnabled,k=k.nextSibling,
+k.className=e.fnDisplayEnd()==e.fnRecordsDisplay()?h.sPageNextDisabled:h.sPageNextEnabled}},iFullNumbersShowPages:5,full_numbers:{fnInit:function(e,j,m){var k=e.oLanguage.oPaginate,l=e.oClasses,n=function(h){e.oApi._fnPageChange(e,h.data.action)&&m(e)};h(j).append('<a  tabindex="'+e.iTabIndex+'" class="'+l.sPageButton+" "+l.sPageFirst+'">'+k.sFirst+'</a><a  tabindex="'+e.iTabIndex+'" class="'+l.sPageButton+" "+l.sPagePrevious+'">'+k.sPrevious+'</a><span></span><a tabindex="'+e.iTabIndex+'" class="'+
+l.sPageButton+" "+l.sPageNext+'">'+k.sNext+'</a><a tabindex="'+e.iTabIndex+'" class="'+l.sPageButton+" "+l.sPageLast+'">'+k.sLast+"</a>");var t=h("a",j),k=t[0],l=t[1],r=t[2],t=t[3];e.oApi._fnBindAction(k,{action:"first"},n);e.oApi._fnBindAction(l,{action:"previous"},n);e.oApi._fnBindAction(r,{action:"next"},n);e.oApi._fnBindAction(t,{action:"last"},n);e.aanFeatures.p||(j.id=e.sTableId+"_paginate",k.id=e.sTableId+"_first",l.id=e.sTableId+"_previous",r.id=e.sTableId+"_next",t.id=e.sTableId+"_last")},
+fnUpdate:function(e,o){if(e.aanFeatures.p){var m=j.ext.oPagination.iFullNumbersShowPages,k=Math.floor(m/2),l=Math.ceil(e.fnRecordsDisplay()/e._iDisplayLength),n=Math.ceil(e._iDisplayStart/e._iDisplayLength)+1,t="",r,B=e.oClasses,u,M=e.aanFeatures.p,L=function(h){e.oApi._fnBindAction(this,{page:h+r-1},function(h){e.oApi._fnPageChange(e,h.data.page);o(e);h.preventDefault()})};-1===e._iDisplayLength?n=k=r=1:l<m?(r=1,k=l):n<=k?(r=1,k=m):n>=l-k?(r=l-m+1,k=l):(r=n-Math.ceil(m/2)+1,k=r+m-1);for(m=r;m<=k;m++)t+=
+n!==m?'<a tabindex="'+e.iTabIndex+'" class="'+B.sPageButton+'">'+e.fnFormatNumber(m)+"</a>":'<a tabindex="'+e.iTabIndex+'" class="'+B.sPageButtonActive+'">'+e.fnFormatNumber(m)+"</a>";m=0;for(k=M.length;m<k;m++)u=M[m],u.hasChildNodes()&&(h("span:eq(0)",u).html(t).children("a").each(L),u=u.getElementsByTagName("a"),u=[u[0],u[1],u[u.length-2],u[u.length-1]],h(u).removeClass(B.sPageButton+" "+B.sPageButtonActive+" "+B.sPageButtonStaticDisabled),h([u[0],u[1]]).addClass(1==n?B.sPageButtonStaticDisabled:
+B.sPageButton),h([u[2],u[3]]).addClass(0===l||n===l||-1===e._iDisplayLength?B.sPageButtonStaticDisabled:B.sPageButton))}}}});h.extend(j.ext.oSort,{"string-pre":function(e){"string"!=typeof e&&(e=null!==e&&e.toString?e.toString():"");return e.toLowerCase()},"string-asc":function(e,h){return e<h?-1:e>h?1:0},"string-desc":function(e,h){return e<h?1:e>h?-1:0},"html-pre":function(e){return e.replace(/<.*?>/g,"").toLowerCase()},"html-asc":function(e,h){return e<h?-1:e>h?1:0},"html-desc":function(e,h){return e<
+h?1:e>h?-1:0},"date-pre":function(e){e=Date.parse(e);if(isNaN(e)||""===e)e=Date.parse("01/01/1970 00:00:00");return e},"date-asc":function(e,h){return e-h},"date-desc":function(e,h){return h-e},"numeric-pre":function(e){return"-"==e||""===e?0:1*e},"numeric-asc":function(e,h){return e-h},"numeric-desc":function(e,h){return h-e}});h.extend(j.ext.aTypes,[function(e){if("number"===typeof e)return"numeric";if("string"!==typeof e)return null;var h,j=!1;h=e.charAt(0);if(-1=="0123456789-".indexOf(h))return null;
+for(var k=1;k<e.length;k++){h=e.charAt(k);if(-1=="0123456789.".indexOf(h))return null;if("."==h){if(j)return null;j=!0}}return"numeric"},function(e){var h=Date.parse(e);return null!==h&&!isNaN(h)||"string"===typeof e&&0===e.length?"date":null},function(e){return"string"===typeof e&&-1!=e.indexOf("<")&&-1!=e.indexOf(">")?"html":null}]);h.fn.DataTable=j;h.fn.dataTable=j;h.fn.dataTableSettings=j.settings;h.fn.dataTableExt=j.ext};"function"===typeof define&&define.amd?define(["jquery"],L):jQuery&&!jQuery.fn.dataTable&&
+L(jQuery)})(window,document);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc
new file mode 100644
index 0000000..703d1e3
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc
@@ -0,0 +1,20 @@
+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+<script type="text/javascript">
+//<![CDATA[
+    var MSG_DT_FIRST = _("First");
+    var MSG_DT_LAST = _("Last");
+    var MSG_DT_NEXT = _("Next");
+    var MSG_DT_PREVIOUS = _("Previous");
+    var MSG_DT_EMPTY_TABLE = _("No data available in table");
+    var MSG_DT_INFO = _("Showing _START_ to _END_ of _TOTAL_");
+    var MSG_DT_INFO_EMPTY = _("No entries to show");
+    var MSG_DT_INFO_FILTERED = _("(filtered from _MAX_ total entries)");
+    var MSG_DT_LENGTH_MENU = _("Show _MENU_ entries");
+    var MSG_DT_LOADING_RECORDS = _("Loading...");
+    var MSG_DT_PROCESSING = _("Processing...");
+    var MSG_DT_SEARCH = _("Search:");
+    var MSG_DT_ZERO_RECORDS = _("No matching records found");
+    var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the");
+//]]>
+</script>
+<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
index 34aa8e9..2ee9d0b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
@@ -2,9 +2,7 @@
 <title>Koha &rsaquo; Acquisitions</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index 3627077..f884b2a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -9,9 +9,7 @@
 </title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 <script type="text/JavaScript">
 //<![CDATA[
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index 84df886..6f450c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -3,10 +3,7 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
-
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
     function updateColumnsVisibility(visible) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
index 6bb0048..d4027a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -3,8 +3,7 @@
 <title>Koha &rsaquo; Basket grouping for [% booksellername |html %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script>
 <script type="text/javascript" src="[% yuipath %]/button/button-min.js"></script>
 <script type="text/javascript" src="[% yuipath %]/container/container_core-min.js"></script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
index 525ea66..dff9957 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
@@ -8,9 +8,7 @@
 }
 </style>
 <link rel="stylesheet" href="[% themelang %]/css/datatables.css" />
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
index 4132edb..c539fe0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
@@ -4,9 +4,7 @@
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
 [% IF (dateformat == 'metric') %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
index 1ce4cd8..008e241 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
@@ -5,9 +5,7 @@
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
     $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
index 16c1b61..584d787 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -4,9 +4,7 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; Invoices</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 [% INCLUDE 'calendar.inc' %]
 <script type="text/javascript">
 //<![CDATA[
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index c825d06..83dcbe5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -3,12 +3,9 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; Late orders</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 [% INCLUDE 'calendar.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 [% IF (dateformat == 'metric') %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
index f2d9925..c466cd1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
@@ -3,9 +3,7 @@
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'greybox.inc' %]
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
  $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
index ea9bc32..a7f7019 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
@@ -3,9 +3,7 @@
 <title>Koha &rsaquo; Serials [% biblionumber %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
     function updateRowsVisibility(show_only_renewed) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
index 54e9c7a..2b30eba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
@@ -2,9 +2,7 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; Add order from a suggestion</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
  $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
index 23441f8..05a3321 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -3,9 +3,7 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; Ordered</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
 [% IF (dateformat == 'metric') %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index 10382cb..90dcf8b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -3,9 +3,7 @@
             Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% formatteddatereceived %][% ELSE %]Receive orders from [% name %][% END %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 [% INCLUDE 'greybox.inc' %]
 <script type="text/javascript" src="[% yuipath %]/json/json-min.js"></script>
 <script type="text/javascript">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
index 26e4af8..122bbb7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -4,9 +4,7 @@
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
  $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
index 95634d0..4dae398 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -3,9 +3,7 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; Spent</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
  $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
index 16b2fd1..0dba956 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -3,9 +3,7 @@
 <title>Koha &rsaquo; Vendor [% bookselname %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 
 <script type="text/javascript">
 //<![CDATA[
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
index a7b5fc9..41aad00 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -2,9 +2,7 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername %][% ELSE %]Orders with uncertain prices[% END %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
  $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index 7ce0222..2983dc3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -3,9 +3,7 @@
 [% INCLUDE 'greybox.inc' %]
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type="text/javascript">
-- 
1.7.9.5

From srdjan at catalyst.net.nz  Mon Jul 29 05:54:31 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon, 29 Jul 2013 15:54:31 +1200
Subject: [Koha-patches] [PATCH] Bug 10649 - Upgrade DataTables and move
	scripts out of theme directory
Message-ID: <1375070071-3864-1-git-send-email-srdjan@catalyst.net.nz>

From: Owen Leonard <oleonard at myacpl.org>

This patch adds an upgraded copy of the DataTables plugin to the jQuery
plugin directory outside the theme directories. Copies of the old
DataTables plugin scripts have been left in the old location while
templates are incrementally updated.

To test, visit each affected page in Acquisitions and confirm that table
sorting still words correctly:

- Acquisitions home
- Acquisitions -> Late orders
- Acquisitions -> Order search
- Acquisitions -> Ordered (from table of available funds)
- Acquisitions -> Spent (from table of available funds)
- Acquisitions -> Vendor search
- Acquisitions -> Vendor detail
- Acquisitions -> Vendor -> Basket
- Acquisitions -> Vendor -> Basket -> Add order from existing record
                                   -> Add order from suggestion
                                   -> Add order from subscription
                                   -> Add order from external source
                                   -> Add order from staged file
- Acquisitions -> Vendor -> Basket groups
- Acquisitions -> Vendor -> Uncertain prices
- Acquisitions -> Vendor -> Invoices
- Acquisitions -> Vendor -> Invoices -> Invoice
- Acquisitions -> Vendor -> Receive shipments
- Acquisitions -> Vendor -> Receive shipments -> Receipt summary (click
  invoice number)

Also test one or more pages which have not been modified to confirm that
old DataTables assets are still in place and working (ex: Circulation,
Quotes editor, Saved reports, etc.)

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 .../lib/jquery/plugins/dataTables.fnReloadAjax.js  |  50 ++
 .../plugins/jquery.dataTables.columnFilter.js      | 762 +++++++++++++++++++++
 .../lib/jquery/plugins/jquery.dataTables.min.js    | 155 +++++
 .../intranet-tmpl/prog/en/includes/datatables.inc  |  20 +
 .../prog/en/modules/acqui/acqui-home.tt            |   4 +-
 .../prog/en/modules/acqui/addorderiso2709.tt       |   4 +-
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   5 +-
 .../prog/en/modules/acqui/basketgroup.tt           |   3 +-
 .../prog/en/modules/acqui/booksellers.tt           |   4 +-
 .../prog/en/modules/acqui/histsearch.tt            |   4 +-
 .../intranet-tmpl/prog/en/modules/acqui/invoice.tt |   4 +-
 .../prog/en/modules/acqui/invoices.tt              |   4 +-
 .../prog/en/modules/acqui/lateorders.tt            |   5 +-
 .../prog/en/modules/acqui/neworderbiblio.tt        |   4 +-
 .../prog/en/modules/acqui/newordersubscription.tt  |   4 +-
 .../prog/en/modules/acqui/newordersuggestion.tt    |   4 +-
 .../intranet-tmpl/prog/en/modules/acqui/ordered.tt |   4 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |   4 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcels.tt |   4 +-
 .../intranet-tmpl/prog/en/modules/acqui/spent.tt   |   4 +-
 .../prog/en/modules/acqui/supplier.tt              |   4 +-
 .../prog/en/modules/acqui/uncertainprice.tt        |   4 +-
 .../prog/en/modules/acqui/z3950_search.tt          |   4 +-
 23 files changed, 1006 insertions(+), 58 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/dataTables.fnReloadAjax.js
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.columnFilter.js
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.min.js
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc

diff --git a/koha-tmpl/intranet-tmpl/lib/jquery/plugins/dataTables.fnReloadAjax.js b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/dataTables.fnReloadAjax.js
new file mode 100644
index 0000000..0eac52a
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/dataTables.fnReloadAjax.js
@@ -0,0 +1,50 @@
+$.fn.dataTableExt.oApi.fnReloadAjax = function ( oSettings, sNewSource, fnCallback, bStandingRedraw )
+{
+    if ( typeof sNewSource != 'undefined' && sNewSource != null )
+    {
+        oSettings.sAjaxSource = sNewSource;
+    }
+    this.oApi._fnProcessingDisplay( oSettings, true );
+    var that = this;
+    var iStart = oSettings._iDisplayStart;
+    var aData = [];
+
+    this.oApi._fnServerParams( oSettings, aData );
+
+    oSettings.fnServerData( oSettings.sAjaxSource, aData, function(json) {
+        /* Clear the old information from the table */
+        that.oApi._fnClearTable( oSettings );
+
+        /* Got the data - add it to the table */
+        var aData =  (oSettings.sAjaxDataProp !== "") ?
+            that.oApi._fnGetObjectDataFn( oSettings.sAjaxDataProp )( json ) : json;
+
+        for ( var i=0 ; i<aData.length ; i++ )
+        {
+            that.oApi._fnAddData( oSettings, aData[i] );
+        }
+
+        oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+        that.fnDraw();
+
+        if ( typeof bStandingRedraw != 'undefined' && bStandingRedraw === true )
+        {
+            oSettings._iDisplayStart = iStart;
+            that.fnDraw( false );
+        }
+
+        that.oApi._fnProcessingDisplay( oSettings, false );
+
+        /* Callback user function - for event handlers etc */
+        if ( typeof fnCallback == 'function' && fnCallback != null )
+        {
+            fnCallback( oSettings );
+        }
+    }, oSettings );
+}
+
+/* Example call to load a new file */
+//oTable.fnReloadAjax( 'media/examples_support/json_source2.txt' );
+
+/* Example call to reload from original file */
+//oTable.fnReloadAjax();
diff --git a/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.columnFilter.js b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.columnFilter.js
new file mode 100644
index 0000000..89343f5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.columnFilter.js
@@ -0,0 +1,762 @@
+/*
+* File:        jquery.dataTables.columnFilter.js
+* Version:     1.5.0.
+* Author:      Jovan Popovic
+*
+* Copyright 2011-2012 Jovan Popovic, all rights reserved.
+*
+* This source file is free software, under either the GPL v2 license or a
+* BSD style license, as supplied with this software.
+*
+* This source file is distributed in the hope that it will be useful, but
+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+* or FITNESS FOR A PARTICULAR PURPOSE.
+*
+* Parameters:"
+* @sPlaceHolder                 String      Place where inline filtering function should be placed ("tfoot", "thead:before", "thead:after"). Default is "tfoot"
+* @sRangeSeparator              String      Separator that will be used when range values are sent to the server-side. Default value is "~".
+* @sRangeFormat                 string      Default format of the From ... to ... range inputs. Default is From {from} to {to}
+* @aoColumns                    Array       Array of the filter settings that will be applied on the columns
+*/
+(function ($) {
+
+
+    $.fn.columnFilter = function (options) {
+
+        var asInitVals, i, label, th;
+
+        //var sTableId = "table";
+        var sRangeFormat = "From {from} to {to}";
+        //Array of the functions that will override sSearch_ parameters
+        var afnSearch_ = new Array();
+        var aiCustomSearch_Indexes = new Array();
+
+        var oFunctionTimeout = null;
+
+        var fnOnFiltered = function () { };
+
+        function _fnGetColumnValues(oSettings, iColumn, bUnique, bFiltered, bIgnoreEmpty) {
+            ///<summary>
+            ///Return values in the column
+            ///</summary>
+            ///<param name="oSettings" type="Object">DataTables settings</param>
+            ///<param name="iColumn" type="int">Id of the column</param>
+            ///<param name="bUnique" type="bool">Return only distinct values</param>
+            ///<param name="bFiltered" type="bool">Return values only from the filtered rows</param>
+            ///<param name="bIgnoreEmpty" type="bool">Ignore empty cells</param>
+
+            // check that we have a column id
+            if (typeof iColumn == "undefined") return new Array();
+
+            // by default we only wany unique data
+            if (typeof bUnique == "undefined") bUnique = true;
+
+            // by default we do want to only look at filtered data
+            if (typeof bFiltered == "undefined") bFiltered = true;
+
+            // by default we do not wany to include empty values
+            if (typeof bIgnoreEmpty == "undefined") bIgnoreEmpty = true;
+
+            // list of rows which we're going to loop through
+            var aiRows;
+
+            // use only filtered rows
+            if (bFiltered == true) aiRows = oSettings.aiDisplay;
+            // use all rows
+            else aiRows = oSettings.aiDisplayMaster; // all row numbers
+
+            // set up data array
+            var asResultData = new Array();
+
+            for (var i = 0, c = aiRows.length; i < c; i++) {
+                var iRow = aiRows[i];
+                var aData = oTable.fnGetData(iRow);
+                var sValue = aData[iColumn];
+
+                // ignore empty values?
+                if (bIgnoreEmpty == true && sValue.length == 0) continue;
+
+                // ignore unique values?
+                else if (bUnique == true && jQuery.inArray(sValue, asResultData) > -1) continue;
+
+                // else push the value onto the result data array
+                else asResultData.push(sValue);
+            }
+
+            return asResultData.sort();
+        }
+
+        function _fnColumnIndex(iColumnIndex) {
+            if (properties.bUseColVis)
+                return iColumnIndex;
+            else
+                return oTable.fnSettings().oApi._fnVisibleToColumnIndex(oTable.fnSettings(), iColumnIndex);
+            //return iColumnIndex;
+            //return oTable.fnSettings().oApi._fnColumnIndexToVisible(oTable.fnSettings(), iColumnIndex);
+        }
+
+        function fnCreateInput(oTable, regex, smart, bIsNumber, iFilterLength, iMaxLenght) {
+            var sCSSClass = "text_filter";
+            if (bIsNumber)
+                sCSSClass = "number_filter";
+
+            label = label.replace(/(^\s*)|(\s*$)/g, "");
+            var currentFilter = oTable.fnSettings().aoPreSearchCols[i].sSearch;
+            var search_init = 'search_init ';
+            var inputvalue = label;
+            if (currentFilter != '' && currentFilter != '^') {
+                if (bIsNumber && currentFilter.charAt(0) == '^')
+                    inputvalue = currentFilter.substr(1); //ignore trailing ^
+                else
+                    inputvalue = currentFilter;
+                search_init = '';
+            }
+
+            var input = $('<input type="text" class="' + search_init + sCSSClass + '" value="' + inputvalue + '"/>');
+            if (iMaxLenght != undefined && iMaxLenght != -1) {
+                input.attr('maxlength', iMaxLenght);
+            }
+            th.html(input);
+            if (bIsNumber)
+                th.wrapInner('<span class="filter_column filter_number" />');
+            else
+                th.wrapInner('<span class="filter_column filter_text" />');
+
+            asInitVals[i] = label;
+            var index = i;
+
+            if (bIsNumber && !oTable.fnSettings().oFeatures.bServerSide) {
+                input.keyup(function () {
+                    /* Filter on the column all numbers that starts with the entered value */
+                    oTable.fnFilter('^' + this.value, _fnColumnIndex(index), true, false); //Issue 37
+                    fnOnFiltered();
+                });
+            } else {
+                input.keyup(function () {
+                    if (oTable.fnSettings().oFeatures.bServerSide && iFilterLength != 0) {
+                        //If filter length is set in the server-side processing mode
+                        //Check has the user entered at least iFilterLength new characters
+
+                        var currentFilter = oTable.fnSettings().aoPreSearchCols[index].sSearch;
+                        var iLastFilterLength = $(this).data("dt-iLastFilterLength");
+                        if (typeof iLastFilterLength == "undefined")
+                            iLastFilterLength = 0;
+                        var iCurrentFilterLength = this.value.length;
+                        if (Math.abs(iCurrentFilterLength - iLastFilterLength) < iFilterLength
+                        //&& currentFilter.length == 0 //Why this?
+					        ) {
+                            //Cancel the filtering
+                            return;
+                        }
+                        else {
+                            //Remember the current filter length
+                            $(this).data("dt-iLastFilterLength", iCurrentFilterLength);
+                        }
+                    }
+                    /* Filter on the column (the index) of this element */
+                    oTable.fnFilter(this.value, _fnColumnIndex(index), regex, smart); //Issue 37
+                    fnOnFiltered();
+                });
+            }
+
+            input.focus(function () {
+                if ($(this).hasClass("search_init")) {
+                    $(this).removeClass("search_init");
+                    this.value = "";
+                }
+            });
+            input.blur(function () {
+                if (this.value == "") {
+                    $(this).addClass("search_init");
+                    this.value = asInitVals[index];
+                }
+            });
+        }
+
+        function fnCreateRangeInput(oTable) {
+
+			//var currentFilter = oTable.fnSettings().aoPreSearchCols[i].sSearch;
+            th.html(_fnRangeLabelPart(0));
+            var sFromId = oTable.attr("id") + '_range_from_' + i;
+            var from = $('<input type="text" class="number_range_filter" id="' + sFromId + '" rel="' + i + '"/>');
+            th.append(from);
+            th.append(_fnRangeLabelPart(1));
+            var sToId = oTable.attr("id") + '_range_to_' + i;
+            var to = $('<input type="text" class="number_range_filter" id="' + sToId + '" rel="' + i + '"/>');
+            th.append(to);
+            th.append(_fnRangeLabelPart(2));
+            th.wrapInner('<span class="filter_column filter_number_range" />');
+            var index = i;
+            aiCustomSearch_Indexes.push(i);
+
+
+
+            //------------start range filtering function
+
+
+            /* 	Custom filtering function which will filter data in column four between two values
+            *	Author: 	Allan Jardine, Modified by Jovan Popovic
+            */
+            //$.fn.dataTableExt.afnFiltering.push(
+            oTable.dataTableExt.afnFiltering.push(
+	        function (oSettings, aData, iDataIndex) {
+	            if (oTable.attr("id") != oSettings.sTableId)
+	                return true;
+	            // Try to handle missing nodes more gracefully
+	            if (document.getElementById(sFromId) == null)
+	                return true;
+	            var iMin = document.getElementById(sFromId).value * 1;
+	            var iMax = document.getElementById(sToId).value * 1;
+	            var iValue = aData[_fnColumnIndex(index)] == "-" ? 0 : aData[_fnColumnIndex(index)] * 1;
+	            if (iMin == "" && iMax == "") {
+	                return true;
+	            }
+	            else if (iMin == "" && iValue <= iMax) {
+	                return true;
+	            }
+	            else if (iMin <= iValue && "" == iMax) {
+	                return true;
+	            }
+	            else if (iMin <= iValue && iValue <= iMax) {
+	                return true;
+	            }
+	            return false;
+	        }
+        );
+            //------------end range filtering function
+
+
+
+            $('#' + sFromId + ',#' + sToId, th).keyup(function () {
+
+                var iMin = document.getElementById(sFromId).value * 1;
+                var iMax = document.getElementById(sToId).value * 1;
+                if (iMin != 0 && iMax != 0 && iMin > iMax)
+                    return;
+
+                oTable.fnDraw();
+                fnOnFiltered();
+            });
+
+
+        }
+
+
+        function fnCreateDateRangeInput(oTable) {
+
+            var aoFragments = sRangeFormat.split(/[}{]/);
+
+            th.html("");
+            //th.html(_fnRangeLabelPart(0));
+            var sFromId = oTable.attr("id") + '_range_from_' + i;
+            var from = $('<input type="text" class="date_range_filter" id="' + sFromId + '" rel="' + i + '"/>');
+            from.datepicker();
+            //th.append(from);
+            //th.append(_fnRangeLabelPart(1));
+            var sToId = oTable.attr("id") + '_range_to_' + i;
+            var to = $('<input type="text" class="date_range_filter" id="' + sToId + '" rel="' + i + '"/>');
+            //th.append(to);
+            //th.append(_fnRangeLabelPart(2));
+
+            for (ti = 0; ti < aoFragments.length; ti++) {
+
+                if (aoFragments[ti] == properties.sDateFromToken) {
+                    th.append(from);
+                } else {
+                    if (aoFragments[ti] == properties.sDateToToken) {
+                        th.append(to);
+                    } else {
+                        th.append(aoFragments[ti]);
+                    }
+                }
+
+
+            }
+
+
+            th.wrapInner('<span class="filter_column filter_date_range" />');
+            to.datepicker();
+            var index = i;
+            aiCustomSearch_Indexes.push(i);
+
+
+            //------------start date range filtering function
+
+            //$.fn.dataTableExt.afnFiltering.push(
+            oTable.dataTableExt.afnFiltering.push(
+	        function (oSettings, aData, iDataIndex) {
+	            if (oTable.attr("id") != oSettings.sTableId)
+	                return true;
+
+	            var dStartDate = from.datepicker("getDate");
+
+	            var dEndDate = to.datepicker("getDate");
+
+	            if (dStartDate == null && dEndDate == null) {
+	                return true;
+	            }
+
+	            var dCellDate = null;
+	            try {
+	                if (aData[_fnColumnIndex(index)] == null || aData[_fnColumnIndex(index)] == "")
+	                    return false;
+	                dCellDate = $.datepicker.parseDate($.datepicker.regional[""].dateFormat, aData[_fnColumnIndex(index)]);
+	            } catch (ex) {
+	                return false;
+	            }
+	            if (dCellDate == null)
+	                return false;
+
+
+	            if (dStartDate == null && dCellDate <= dEndDate) {
+	                return true;
+	            }
+	            else if (dStartDate <= dCellDate && dEndDate == null) {
+	                return true;
+	            }
+	            else if (dStartDate <= dCellDate && dCellDate <= dEndDate) {
+	                return true;
+	            }
+	            return false;
+	        }
+        );
+            //------------end date range filtering function
+
+            $('#' + sFromId + ',#' + sToId, th).change(function () {
+                oTable.fnDraw();
+                fnOnFiltered();
+            });
+
+
+        }
+
+        function fnCreateColumnSelect(oTable, aData, iColumn, nTh, sLabel, bRegex, oSelected) {
+            if (aData == null)
+                aData = _fnGetColumnValues(oTable.fnSettings(), iColumn, true, false, true);
+            var index = iColumn;
+            var currentFilter = oTable.fnSettings().aoPreSearchCols[i].sSearch;
+            if (currentFilter == null || currentFilter == "")//Issue 81
+                currentFilter = oSelected;
+
+            var r = '<select class="search_init select_filter"><option value="" class="search_init">' + sLabel + '</option>';
+            var j = 0;
+            var iLen = aData.length;
+            for (j = 0; j < iLen; j++) {
+                if (typeof (aData[j]) != 'object') {
+                    var selected = '';
+                    if (escape(aData[j]) == currentFilter
+                        || escape(aData[j]) == escape(currentFilter)
+                        )
+                        selected = 'selected '
+                    r += '<option ' + selected + ' value="' + escape(aData[j]) + '">' + aData[j] + '</option>';
+                }
+                else {
+                    var selected = '';
+                    if (bRegex) {
+                        //Do not escape values if they are explicitely set to avoid escaping special characters in the regexp
+                        if (aData[j].value == currentFilter) selected = 'selected ';
+                        r += '<option ' + selected + 'value="' + aData[j].value + '">' + aData[j].label + '</option>';
+                    } else {
+                        if (escape(aData[j].value) == currentFilter) selected = 'selected ';
+                        r += '<option ' + selected + 'value="' + escape(aData[j].value) + '">' + aData[j].label + '</option>';
+                    }
+                }
+            }
+
+            var select = $(r + '</select>');
+            nTh.html(select);
+            nTh.wrapInner('<span class="filter_column filter_select" />');
+            select.change(function () {
+                //var val = $(this).val();
+                if ($(this).val() != "") {
+                    $(this).removeClass("search_init");
+                } else {
+                    $(this).addClass("search_init");
+                }
+                if (bRegex)
+                    oTable.fnFilter($(this).val(), iColumn, bRegex); //Issue 41
+                else
+                    oTable.fnFilter(unescape($(this).val()), iColumn); //Issue 25
+                fnOnFiltered();
+            });
+            if (currentFilter != null && currentFilter != "")//Issue 81
+                oTable.fnFilter(unescape(currentFilter), iColumn);
+        }
+
+        function fnCreateSelect(oTable, aData, bRegex, oSelected) {
+            var oSettings = oTable.fnSettings();
+            if (aData == null && oSettings.sAjaxSource != "" && !oSettings.oFeatures.bServerSide) {
+                // Add a function to the draw callback, which will check for the Ajax data having
+                // been loaded. Use a closure for the individual column elements that are used to
+                // built the column filter, since 'i' and 'th' (etc) are locally "global".
+                oSettings.aoDrawCallback.push({
+                    "fn": (function (iColumn, nTh, sLabel) {
+                        return function () {
+                            // Only rebuild the select on the second draw - i.e. when the Ajax
+                            // data has been loaded.
+                            if (oSettings.iDraw == 2 && oSettings.sAjaxSource != null && oSettings.sAjaxSource != "" && !oSettings.oFeatures.bServerSide) {
+                                return fnCreateColumnSelect(oTable, null, _fnColumnIndex(iColumn), nTh, sLabel, bRegex, oSelected); //Issue 37
+                            }
+                        };
+                    })(i, th, label),
+                    "sName": "column_filter_" + i
+                });
+            }
+            // Regardless of the Ajax state, build the select on first pass
+            fnCreateColumnSelect(oTable, aData, _fnColumnIndex(i), th, label, bRegex, oSelected); //Issue 37
+
+        }
+
+        function fnCreateCheckbox(oTable, aData) {
+
+            if (aData == null)
+                aData = _fnGetColumnValues(oTable.fnSettings(), i, true, true, true);
+            var index = i;
+
+            var r = '', j, iLen = aData.length;
+
+            //clean the string
+            var localLabel = label.replace('%', 'Perc').replace("&", "AND").replace("$", "DOL").replace("?", "STERL").replace("@", "AT").replace(/\s/g, "_");
+            localLabel = localLabel.replace(/[^a-zA-Z 0-9]+/g, '');
+            //clean the string
+
+            //button label override
+            var labelBtn = label;
+            if (properties.sFilterButtonText != null || properties.sFilterButtonText != undefined) {
+                labelBtn = properties.sFilterButtonText;
+            }
+
+            var relativeDivWidthToggleSize = 10;
+            var numRow = 12; //numero di checkbox per colonna
+            var numCol = Math.floor(iLen / numRow);
+            if (iLen % numRow > 0) {
+                numCol = numCol + 1;
+            };
+
+            //count how many column should be generated and split the div size
+            var divWidth = 100 / numCol - 2;
+
+            var divWidthToggle = relativeDivWidthToggleSize * numCol;
+
+            if (numCol == 1) {
+                divWidth = 20;
+            }
+
+            var divRowDef = '<div style="float:left; min-width: ' + divWidth + '%; " >';
+            var divClose = '</div>';
+
+            var uniqueId = oTable.attr("id") + localLabel;
+            var buttonId = "chkBtnOpen" + uniqueId;
+            var checkToggleDiv = uniqueId + "-flt-toggle";
+            r += '<button id="' + buttonId + '" class="checkbox_filter" > ' + labelBtn + '</button>'; //filter button witch open dialog
+            r += '<div id="' + checkToggleDiv + '" '
+		+ 'title="' + label + '" '
+		+ 'class="toggle-check ui-widget-content ui-corner-all"  style="width: ' + (divWidthToggle) + '%; " >'; //dialog div
+            //r+= '<div align="center" style="margin-top: 5px; "> <button id="'+buttonId+'Reset" class="checkbox_filter" > reset </button> </div>'; //reset button and its div
+            r += divRowDef;
+
+            for (j = 0; j < iLen; j++) {
+
+                //if last check close div
+                if (j % numRow == 0 && j != 0) {
+                    r += divClose + divRowDef;
+                }
+
+                //check button
+                r += '<input class="search_init checkbox_filter" type="checkbox" id= "' + aData[j] + '" name= "' + localLabel + '" value="' + aData[j] + '" >' + aData[j] + '<br/>';
+
+                var checkbox = $(r);
+                th.html(checkbox);
+                th.wrapInner('<span class="filter_column filter_checkbox" />');
+                //on every checkbox selection
+                checkbox.change(function () {
+
+                    var search = '';
+                    var or = '|'; //var for select checks in 'or' into the regex
+                    var resSize = $('input:checkbox[name="' + localLabel + '"]:checked').size();
+                    $('input:checkbox[name="' + localLabel + '"]:checked').each(function (index) {
+
+                        //search = search + ' ' + $(this).val();
+                        //concatenation for selected checks in or
+                        if ((index == 0 && resSize == 1)
+						|| (index != 0 && index == resSize - 1)) {
+                            or = '';
+                        }
+                        //trim
+                        search = search.replace(/^\s+|\s+$/g, "");
+                        search = search + $(this).val() + or;
+                        or = '|';
+
+                    });
+
+                    for (var jj = 0; jj < iLen; jj++) {
+                        if (search != "") {
+                            $('#' + aData[jj]).removeClass("search_init");
+                        } else {
+                            $('#' + aData[jj]).addClass("search_init");
+                        }
+                    }
+
+                    //execute search
+                    oTable.fnFilter(search, index, true, false);
+                    fnOnFiltered();
+                });
+            }
+
+            //filter button
+            $('#' + buttonId).button();
+            //dialog
+            $('#' + checkToggleDiv).dialog({
+                //height: 140,
+                autoOpen: false,
+                //show: "blind",
+                hide: "blind",
+                buttons: [{
+                    text: "Reset",
+                    click: function () {
+                        //$('#'+buttonId).removeClass("filter_selected"); //LM remove border if filter selected
+                        $('input:checkbox[name="' + localLabel + '"]:checked').each(function (index3) {
+                            $(this).attr('checked', false);
+                            $(this).addClass("search_init");
+                        });
+                        oTable.fnFilter('', index, true, false);
+                        fnOnFiltered();
+                        return false;
+                    }
+                },
+							{
+							    text: "Close",
+							    click: function () { $(this).dialog("close"); }
+							}
+						]
+            });
+
+
+            $('#' + buttonId).click(function () {
+
+                $('#' + checkToggleDiv).dialog('open');
+                var target = $(this);
+                $('#' + checkToggleDiv).dialog("widget").position({ my: 'top',
+                    at: 'bottom',
+                    of: target
+                });
+
+                return false;
+            });
+
+            var fnOnFilteredCurrent = fnOnFiltered;
+
+            fnOnFiltered = function () {
+                var target = $('#' + buttonId);
+                $('#' + checkToggleDiv).dialog("widget").position({ my: 'top',
+                    at: 'bottom',
+                    of: target
+                });
+                fnOnFilteredCurrent();
+            };
+            //reset
+            /*
+            $('#'+buttonId+"Reset").button();
+            $('#'+buttonId+"Reset").click(function(){
+            $('#'+buttonId).removeClass("filter_selected"); //LM remove border if filter selected
+            $('input:checkbox[name="'+localLabel+'"]:checked').each(function(index3) {
+            $(this).attr('checked', false);
+            $(this).addClass("search_init");
+            });
+            oTable.fnFilter('', index, true, false);
+            return false;
+            });
+            */
+        }
+
+
+
+
+        function _fnRangeLabelPart(iPlace) {
+            switch (iPlace) {
+                case 0:
+                    return sRangeFormat.substring(0, sRangeFormat.indexOf("{from}"));
+                case 1:
+                    return sRangeFormat.substring(sRangeFormat.indexOf("{from}") + 6, sRangeFormat.indexOf("{to}"));
+                default:
+                    return sRangeFormat.substring(sRangeFormat.indexOf("{to}") + 4);
+            }
+        }
+
+
+
+
+        var oTable = this;
+
+        var defaults = {
+            sPlaceHolder: "foot",
+            sRangeSeparator: "~",
+            iFilteringDelay: 500,
+            aoColumns: null,
+            sRangeFormat: "From {from} to {to}",
+            sDateFromToken: "from",
+            sDateToToken: "to"
+        };
+
+        var properties = $.extend(defaults, options);
+
+        return this.each(function () {
+
+            if (!oTable.fnSettings().oFeatures.bFilter)
+                return;
+            asInitVals = new Array();
+
+            var aoFilterCells = oTable.fnSettings().aoFooter[0];
+
+            var oHost = oTable.fnSettings().nTFoot; //Before fix for ColVis
+            var sFilterRow = "tr"; //Before fix for ColVis
+
+            if (properties.sPlaceHolder == "head:after") {
+                var tr = $("tr:first", oTable.fnSettings().nTHead).detach();
+                //tr.appendTo($(oTable.fnSettings().nTHead));
+                if (oTable.fnSettings().bSortCellsTop) {
+                    tr.prependTo($(oTable.fnSettings().nTHead));
+                    //tr.appendTo($("thead", oTable));
+                    aoFilterCells = oTable.fnSettings().aoHeader[1];
+                }
+                else {
+                    tr.appendTo($(oTable.fnSettings().nTHead));
+                    //tr.prependTo($("thead", oTable));
+                    aoFilterCells = oTable.fnSettings().aoHeader[0];
+                }
+
+                sFilterRow = "tr:last";
+                oHost = oTable.fnSettings().nTHead;
+
+            } else if (properties.sPlaceHolder == "head:before") {
+
+                if (oTable.fnSettings().bSortCellsTop) {
+                    var tr = $("tr:first", oTable.fnSettings().nTHead).detach();
+                    tr.appendTo($(oTable.fnSettings().nTHead));
+                    aoFilterCells = oTable.fnSettings().aoHeader[1];
+                } else {
+                    aoFilterCells = oTable.fnSettings().aoHeader[0];
+                }
+                /*else {
+                //tr.prependTo($("thead", oTable));
+                sFilterRow = "tr:first";
+                }*/
+
+                sFilterRow = "tr:first";
+
+                oHost = oTable.fnSettings().nTHead;
+
+
+            }
+
+            //$(sFilterRow + " th", oHost).each(function (index) {//bug with ColVis
+            $(aoFilterCells).each(function (index) {//fix for ColVis
+                i = index;
+                var aoColumn = { type: "text",
+                    bRegex: false,
+                    bSmart: true,
+                    iMaxLenght: -1,
+                    iFilterLength: 0
+                };
+                if (properties.aoColumns != null) {
+                    if (properties.aoColumns.length < i || properties.aoColumns[i] == null)
+                        return;
+                    aoColumn = properties.aoColumns[i];
+                }
+                //label = $(this).text(); //Before fix for ColVis
+                label = $($(this)[0].cell).text(); //Fix for ColVis
+                if (aoColumn.sSelector == null) {
+                    //th = $($(this)[0]);//Before fix for ColVis
+                    th = $($(this)[0].cell); //Fix for ColVis
+                }
+                else {
+                    th = $(aoColumn.sSelector);
+                    if (th.length == 0)
+                        th = $($(this)[0].cell);
+                }
+
+                if (aoColumn != null) {
+                    if (aoColumn.sRangeFormat != null)
+                        sRangeFormat = aoColumn.sRangeFormat;
+                    else
+                        sRangeFormat = properties.sRangeFormat;
+                    switch (aoColumn.type) {
+                        case "null":
+                            break;
+                        case "number":
+                            fnCreateInput(oTable, true, false, true, aoColumn.iFilterLength, aoColumn.iMaxLenght);
+                            break;
+                        case "select":
+                            if (aoColumn.bRegex != true)
+                                aoColumn.bRegex = false;
+                            fnCreateSelect(oTable, aoColumn.values, aoColumn.bRegex, aoColumn.selected);
+                            break;
+                        case "number-range":
+                            fnCreateRangeInput(oTable);
+                            break;
+                        case "date-range":
+                            fnCreateDateRangeInput(oTable);
+                            break;
+                        case "checkbox":
+                            fnCreateCheckbox(oTable, aoColumn.values);
+                            break;
+                        case "text":
+                        default:
+                            bRegex = (aoColumn.bRegex == null ? false : aoColumn.bRegex);
+                            bSmart = (aoColumn.bSmart == null ? false : aoColumn.bSmart);
+                            fnCreateInput(oTable, bRegex, bSmart, false, aoColumn.iFilterLength, aoColumn.iMaxLenght);
+                            break;
+
+                    }
+                }
+            });
+
+            for (j = 0; j < aiCustomSearch_Indexes.length; j++) {
+                //var index = aiCustomSearch_Indexes[j];
+                var fnSearch_ = function () {
+                    var id = oTable.attr("id");
+                    return $("#" + id + "_range_from_" + aiCustomSearch_Indexes[j]).val() + properties.sRangeSeparator + $("#" + id + "_range_to_" + aiCustomSearch_Indexes[j]).val()
+                }
+                afnSearch_.push(fnSearch_);
+            }
+
+            if (oTable.fnSettings().oFeatures.bServerSide) {
+
+                var fnServerDataOriginal = oTable.fnSettings().fnServerData;
+
+                oTable.fnSettings().fnServerData = function (sSource, aoData, fnCallback) {
+
+                    for (j = 0; j < aiCustomSearch_Indexes.length; j++) {
+                        var index = aiCustomSearch_Indexes[j];
+
+                        for (k = 0; k < aoData.length; k++) {
+                            if (aoData[k].name == "sSearch_" + index)
+                                aoData[k].value = afnSearch_[j]();
+                        }
+                    }
+                    aoData.push({ "name": "sRangeSeparator", "value": properties.sRangeSeparator });
+
+                    if (fnServerDataOriginal != null) {
+                        try {
+                            fnServerDataOriginal(sSource, aoData, fnCallback, oTable.fnSettings()); //TODO: See Issue 18
+                        } catch (ex) {
+                            fnServerDataOriginal(sSource, aoData, fnCallback);
+                        }
+                    }
+                    else {
+                        $.getJSON(sSource, aoData, function (json) {
+                            fnCallback(json)
+                        });
+                    }
+                };
+
+            }
+
+        });
+
+    };
+
+
+
+
+})(jQuery);
diff --git a/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.min.js b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.min.js
new file mode 100644
index 0000000..02694a4
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.min.js
@@ -0,0 +1,155 @@
+/*
+ * File:        jquery.dataTables.min.js
+ * Version:     1.9.4
+ * Author:      Allan Jardine (www.sprymedia.co.uk)
+ * Info:        www.datatables.net
+ * 
+ * Copyright 2008-2012 Allan Jardine, all rights reserved.
+ *
+ * This source file is free software, under either the GPL v2 license or a
+ * BSD style license, available at:
+ *   http://datatables.net/license_gpl2
+ *   http://datatables.net/license_bsd
+ * 
+ * This source file is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
+ */
+(function(X,l,n){var L=function(h){var j=function(e){function o(a,b){var c=j.defaults.columns,d=a.aoColumns.length,c=h.extend({},j.models.oColumn,c,{sSortingClass:a.oClasses.sSortable,sSortingClassJUI:a.oClasses.sSortJUI,nTh:b?b:l.createElement("th"),sTitle:c.sTitle?c.sTitle:b?b.innerHTML:"",aDataSort:c.aDataSort?c.aDataSort:[d],mData:c.mData?c.oDefaults:d});a.aoColumns.push(c);if(a.aoPreSearchCols[d]===n||null===a.aoPreSearchCols[d])a.aoPreSearchCols[d]=h.extend({},j.models.oSearch);else if(c=a.aoPreSearchCols[d],
+c.bRegex===n&&(c.bRegex=!0),c.bSmart===n&&(c.bSmart=!0),c.bCaseInsensitive===n)c.bCaseInsensitive=!0;m(a,d,null)}function m(a,b,c){var d=a.aoColumns[b];c!==n&&null!==c&&(c.mDataProp&&!c.mData&&(c.mData=c.mDataProp),c.sType!==n&&(d.sType=c.sType,d._bAutoType=!1),h.extend(d,c),p(d,c,"sWidth","sWidthOrig"),c.iDataSort!==n&&(d.aDataSort=[c.iDataSort]),p(d,c,"aDataSort"));var i=d.mRender?Q(d.mRender):null,f=Q(d.mData);d.fnGetData=function(a,b){var c=f(a,b);return d.mRender&&b&&""!==b?i(c,b,a):c};d.fnSetData=
+L(d.mData);a.oFeatures.bSort||(d.bSortable=!1);!d.bSortable||-1==h.inArray("asc",d.asSorting)&&-1==h.inArray("desc",d.asSorting)?(d.sSortingClass=a.oClasses.sSortableNone,d.sSortingClassJUI=""):-1==h.inArray("asc",d.asSorting)&&-1==h.inArray("desc",d.asSorting)?(d.sSortingClass=a.oClasses.sSortable,d.sSortingClassJUI=a.oClasses.sSortJUI):-1!=h.inArray("asc",d.asSorting)&&-1==h.inArray("desc",d.asSorting)?(d.sSortingClass=a.oClasses.sSortableAsc,d.sSortingClassJUI=a.oClasses.sSortJUIAscAllowed):-1==
+h.inArray("asc",d.asSorting)&&-1!=h.inArray("desc",d.asSorting)&&(d.sSortingClass=a.oClasses.sSortableDesc,d.sSortingClassJUI=a.oClasses.sSortJUIDescAllowed)}function k(a){if(!1===a.oFeatures.bAutoWidth)return!1;da(a);for(var b=0,c=a.aoColumns.length;b<c;b++)a.aoColumns[b].nTh.style.width=a.aoColumns[b].sWidth}function G(a,b){var c=r(a,"bVisible");return"number"===typeof c[b]?c[b]:null}function R(a,b){var c=r(a,"bVisible"),c=h.inArray(b,c);return-1!==c?c:null}function t(a){return r(a,"bVisible").length}
+function r(a,b){var c=[];h.map(a.aoColumns,function(a,i){a[b]&&c.push(i)});return c}function B(a){for(var b=j.ext.aTypes,c=b.length,d=0;d<c;d++){var i=b[d](a);if(null!==i)return i}return"string"}function u(a,b){for(var c=b.split(","),d=[],i=0,f=a.aoColumns.length;i<f;i++)for(var g=0;g<f;g++)if(a.aoColumns[i].sName==c[g]){d.push(g);break}return d}function M(a){for(var b="",c=0,d=a.aoColumns.length;c<d;c++)b+=a.aoColumns[c].sName+",";return b.length==d?"":b.slice(0,-1)}function ta(a,b,c,d){var i,f,
+g,e,w;if(b)for(i=b.length-1;0<=i;i--){var j=b[i].aTargets;h.isArray(j)||D(a,1,"aTargets must be an array of targets, not a "+typeof j);f=0;for(g=j.length;f<g;f++)if("number"===typeof j[f]&&0<=j[f]){for(;a.aoColumns.length<=j[f];)o(a);d(j[f],b[i])}else if("number"===typeof j[f]&&0>j[f])d(a.aoColumns.length+j[f],b[i]);else if("string"===typeof j[f]){e=0;for(w=a.aoColumns.length;e<w;e++)("_all"==j[f]||h(a.aoColumns[e].nTh).hasClass(j[f]))&&d(e,b[i])}}if(c){i=0;for(a=c.length;i<a;i++)d(i,c[i])}}function H(a,
+b){var c;c=h.isArray(b)?b.slice():h.extend(!0,{},b);var d=a.aoData.length,i=h.extend(!0,{},j.models.oRow);i._aData=c;a.aoData.push(i);for(var f,i=0,g=a.aoColumns.length;i<g;i++)c=a.aoColumns[i],"function"===typeof c.fnRender&&c.bUseRendered&&null!==c.mData?F(a,d,i,S(a,d,i)):F(a,d,i,v(a,d,i)),c._bAutoType&&"string"!=c.sType&&(f=v(a,d,i,"type"),null!==f&&""!==f&&(f=B(f),null===c.sType?c.sType=f:c.sType!=f&&"html"!=c.sType&&(c.sType="string")));a.aiDisplayMaster.push(d);a.oFeatures.bDeferRender||ea(a,
+d);return d}function ua(a){var b,c,d,i,f,g,e;if(a.bDeferLoading||null===a.sAjaxSource)for(b=a.nTBody.firstChild;b;){if("TR"==b.nodeName.toUpperCase()){c=a.aoData.length;b._DT_RowIndex=c;a.aoData.push(h.extend(!0,{},j.models.oRow,{nTr:b}));a.aiDisplayMaster.push(c);f=b.firstChild;for(d=0;f;){g=f.nodeName.toUpperCase();if("TD"==g||"TH"==g)F(a,c,d,h.trim(f.innerHTML)),d++;f=f.nextSibling}}b=b.nextSibling}i=T(a);d=[];b=0;for(c=i.length;b<c;b++)for(f=i[b].firstChild;f;)g=f.nodeName.toUpperCase(),("TD"==
+g||"TH"==g)&&d.push(f),f=f.nextSibling;c=0;for(i=a.aoColumns.length;c<i;c++){e=a.aoColumns[c];null===e.sTitle&&(e.sTitle=e.nTh.innerHTML);var w=e._bAutoType,o="function"===typeof e.fnRender,k=null!==e.sClass,n=e.bVisible,m,p;if(w||o||k||!n){g=0;for(b=a.aoData.length;g<b;g++)f=a.aoData[g],m=d[g*i+c],w&&"string"!=e.sType&&(p=v(a,g,c,"type"),""!==p&&(p=B(p),null===e.sType?e.sType=p:e.sType!=p&&"html"!=e.sType&&(e.sType="string"))),e.mRender?m.innerHTML=v(a,g,c,"display"):e.mData!==c&&(m.innerHTML=v(a,
+g,c,"display")),o&&(p=S(a,g,c),m.innerHTML=p,e.bUseRendered&&F(a,g,c,p)),k&&(m.className+=" "+e.sClass),n?f._anHidden[c]=null:(f._anHidden[c]=m,m.parentNode.removeChild(m)),e.fnCreatedCell&&e.fnCreatedCell.call(a.oInstance,m,v(a,g,c,"display"),f._aData,g,c)}}if(0!==a.aoRowCreatedCallback.length){b=0;for(c=a.aoData.length;b<c;b++)f=a.aoData[b],A(a,"aoRowCreatedCallback",null,[f.nTr,f._aData,b])}}function I(a,b){return b._DT_RowIndex!==n?b._DT_RowIndex:null}function fa(a,b,c){for(var b=J(a,b),d=0,a=
+a.aoColumns.length;d<a;d++)if(b[d]===c)return d;return-1}function Y(a,b,c,d){for(var i=[],f=0,g=d.length;f<g;f++)i.push(v(a,b,d[f],c));return i}function v(a,b,c,d){var i=a.aoColumns[c];if((c=i.fnGetData(a.aoData[b]._aData,d))===n)return a.iDrawError!=a.iDraw&&null===i.sDefaultContent&&(D(a,0,"Requested unknown parameter "+("function"==typeof i.mData?"{mData function}":"'"+i.mData+"'")+" from the data source for row "+b),a.iDrawError=a.iDraw),i.sDefaultContent;if(null===c&&null!==i.sDefaultContent)c=
+i.sDefaultContent;else if("function"===typeof c)return c();return"display"==d&&null===c?"":c}function F(a,b,c,d){a.aoColumns[c].fnSetData(a.aoData[b]._aData,d)}function Q(a){if(null===a)return function(){return null};if("function"===typeof a)return function(b,d,i){return a(b,d,i)};if("string"===typeof a&&(-1!==a.indexOf(".")||-1!==a.indexOf("["))){var b=function(a,d,i){var f=i.split("."),g;if(""!==i){var e=0;for(g=f.length;e<g;e++){if(i=f[e].match(U)){f[e]=f[e].replace(U,"");""!==f[e]&&(a=a[f[e]]);
+g=[];f.splice(0,e+1);for(var f=f.join("."),e=0,h=a.length;e<h;e++)g.push(b(a[e],d,f));a=i[0].substring(1,i[0].length-1);a=""===a?g:g.join(a);break}if(null===a||a[f[e]]===n)return n;a=a[f[e]]}}return a};return function(c,d){return b(c,d,a)}}return function(b){return b[a]}}function L(a){if(null===a)return function(){};if("function"===typeof a)return function(b,d){a(b,"set",d)};if("string"===typeof a&&(-1!==a.indexOf(".")||-1!==a.indexOf("["))){var b=function(a,d,i){var i=i.split("."),f,g,e=0;for(g=
+i.length-1;e<g;e++){if(f=i[e].match(U)){i[e]=i[e].replace(U,"");a[i[e]]=[];f=i.slice();f.splice(0,e+1);g=f.join(".");for(var h=0,j=d.length;h<j;h++)f={},b(f,d[h],g),a[i[e]].push(f);return}if(null===a[i[e]]||a[i[e]]===n)a[i[e]]={};a=a[i[e]]}a[i[i.length-1].replace(U,"")]=d};return function(c,d){return b(c,d,a)}}return function(b,d){b[a]=d}}function Z(a){for(var b=[],c=a.aoData.length,d=0;d<c;d++)b.push(a.aoData[d]._aData);return b}function ga(a){a.aoData.splice(0,a.aoData.length);a.aiDisplayMaster.splice(0,
+a.aiDisplayMaster.length);a.aiDisplay.splice(0,a.aiDisplay.length);y(a)}function ha(a,b){for(var c=-1,d=0,i=a.length;d<i;d++)a[d]==b?c=d:a[d]>b&&a[d]--; -1!=c&&a.splice(c,1)}function S(a,b,c){var d=a.aoColumns[c];return d.fnRender({iDataRow:b,iDataColumn:c,oSettings:a,aData:a.aoData[b]._aData,mDataProp:d.mData},v(a,b,c,"display"))}function ea(a,b){var c=a.aoData[b],d;if(null===c.nTr){c.nTr=l.createElement("tr");c.nTr._DT_RowIndex=b;c._aData.DT_RowId&&(c.nTr.id=c._aData.DT_RowId);c._aData.DT_RowClass&&
+(c.nTr.className=c._aData.DT_RowClass);for(var i=0,f=a.aoColumns.length;i<f;i++){var g=a.aoColumns[i];d=l.createElement(g.sCellType);d.innerHTML="function"===typeof g.fnRender&&(!g.bUseRendered||null===g.mData)?S(a,b,i):v(a,b,i,"display");null!==g.sClass&&(d.className=g.sClass);g.bVisible?(c.nTr.appendChild(d),c._anHidden[i]=null):c._anHidden[i]=d;g.fnCreatedCell&&g.fnCreatedCell.call(a.oInstance,d,v(a,b,i,"display"),c._aData,b,i)}A(a,"aoRowCreatedCallback",null,[c.nTr,c._aData,b])}}function va(a){var b,
+c,d;if(0!==h("th, td",a.nTHead).length){b=0;for(d=a.aoColumns.length;b<d;b++)if(c=a.aoColumns[b].nTh,c.setAttribute("role","columnheader"),a.aoColumns[b].bSortable&&(c.setAttribute("tabindex",a.iTabIndex),c.setAttribute("aria-controls",a.sTableId)),null!==a.aoColumns[b].sClass&&h(c).addClass(a.aoColumns[b].sClass),a.aoColumns[b].sTitle!=c.innerHTML)c.innerHTML=a.aoColumns[b].sTitle}else{var i=l.createElement("tr");b=0;for(d=a.aoColumns.length;b<d;b++)c=a.aoColumns[b].nTh,c.innerHTML=a.aoColumns[b].sTitle,
+c.setAttribute("tabindex","0"),null!==a.aoColumns[b].sClass&&h(c).addClass(a.aoColumns[b].sClass),i.appendChild(c);h(a.nTHead).html("")[0].appendChild(i);V(a.aoHeader,a.nTHead)}h(a.nTHead).children("tr").attr("role","row");if(a.bJUI){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;i=l.createElement("div");i.className=a.oClasses.sSortJUIWrapper;h(c).contents().appendTo(i);var f=l.createElement("span");f.className=a.oClasses.sSortIcon;i.appendChild(f);c.appendChild(i)}}if(a.oFeatures.bSort)for(b=
+0;b<a.aoColumns.length;b++)!1!==a.aoColumns[b].bSortable?ia(a,a.aoColumns[b].nTh,b):h(a.aoColumns[b].nTh).addClass(a.oClasses.sSortableNone);""!==a.oClasses.sFooterTH&&h(a.nTFoot).children("tr").children("th").addClass(a.oClasses.sFooterTH);if(null!==a.nTFoot){c=N(a,null,a.aoFooter);b=0;for(d=a.aoColumns.length;b<d;b++)c[b]&&(a.aoColumns[b].nTf=c[b],a.aoColumns[b].sClass&&h(c[b]).addClass(a.aoColumns[b].sClass))}}function W(a,b,c){var d,i,f,g=[],e=[],h=a.aoColumns.length,j;c===n&&(c=!1);d=0;for(i=
+b.length;d<i;d++){g[d]=b[d].slice();g[d].nTr=b[d].nTr;for(f=h-1;0<=f;f--)!a.aoColumns[f].bVisible&&!c&&g[d].splice(f,1);e.push([])}d=0;for(i=g.length;d<i;d++){if(a=g[d].nTr)for(;f=a.firstChild;)a.removeChild(f);f=0;for(b=g[d].length;f<b;f++)if(j=h=1,e[d][f]===n){a.appendChild(g[d][f].cell);for(e[d][f]=1;g[d+h]!==n&&g[d][f].cell==g[d+h][f].cell;)e[d+h][f]=1,h++;for(;g[d][f+j]!==n&&g[d][f].cell==g[d][f+j].cell;){for(c=0;c<h;c++)e[d+c][f+j]=1;j++}g[d][f].cell.rowSpan=h;g[d][f].cell.colSpan=j}}}function x(a){var b=
+A(a,"aoPreDrawCallback","preDraw",[a]);if(-1!==h.inArray(!1,b))E(a,!1);else{var c,d,b=[],i=0,f=a.asStripeClasses.length;c=a.aoOpenRows.length;a.bDrawing=!0;a.iInitDisplayStart!==n&&-1!=a.iInitDisplayStart&&(a._iDisplayStart=a.oFeatures.bServerSide?a.iInitDisplayStart:a.iInitDisplayStart>=a.fnRecordsDisplay()?0:a.iInitDisplayStart,a.iInitDisplayStart=-1,y(a));if(a.bDeferLoading)a.bDeferLoading=!1,a.iDraw++;else if(a.oFeatures.bServerSide){if(!a.bDestroying&&!wa(a))return}else a.iDraw++;if(0!==a.aiDisplay.length){var g=
+a._iDisplayStart;d=a._iDisplayEnd;a.oFeatures.bServerSide&&(g=0,d=a.aoData.length);for(;g<d;g++){var e=a.aoData[a.aiDisplay[g]];null===e.nTr&&ea(a,a.aiDisplay[g]);var j=e.nTr;if(0!==f){var o=a.asStripeClasses[i%f];e._sRowStripe!=o&&(h(j).removeClass(e._sRowStripe).addClass(o),e._sRowStripe=o)}A(a,"aoRowCallback",null,[j,a.aoData[a.aiDisplay[g]]._aData,i,g]);b.push(j);i++;if(0!==c)for(e=0;e<c;e++)if(j==a.aoOpenRows[e].nParent){b.push(a.aoOpenRows[e].nTr);break}}}else b[0]=l.createElement("tr"),a.asStripeClasses[0]&&
+(b[0].className=a.asStripeClasses[0]),c=a.oLanguage,f=c.sZeroRecords,1==a.iDraw&&null!==a.sAjaxSource&&!a.oFeatures.bServerSide?f=c.sLoadingRecords:c.sEmptyTable&&0===a.fnRecordsTotal()&&(f=c.sEmptyTable),c=l.createElement("td"),c.setAttribute("valign","top"),c.colSpan=t(a),c.className=a.oClasses.sRowEmpty,c.innerHTML=ja(a,f),b[i].appendChild(c);A(a,"aoHeaderCallback","header",[h(a.nTHead).children("tr")[0],Z(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay]);A(a,"aoFooterCallback","footer",[h(a.nTFoot).children("tr")[0],
+Z(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay]);i=l.createDocumentFragment();c=l.createDocumentFragment();if(a.nTBody){f=a.nTBody.parentNode;c.appendChild(a.nTBody);if(!a.oScroll.bInfinite||!a._bInitComplete||a.bSorted||a.bFiltered)for(;c=a.nTBody.firstChild;)a.nTBody.removeChild(c);c=0;for(d=b.length;c<d;c++)i.appendChild(b[c]);a.nTBody.appendChild(i);null!==f&&f.appendChild(a.nTBody)}A(a,"aoDrawCallback","draw",[a]);a.bSorted=!1;a.bFiltered=!1;a.bDrawing=!1;a.oFeatures.bServerSide&&(E(a,!1),
+a._bInitComplete||$(a))}}function aa(a){a.oFeatures.bSort?O(a,a.oPreviousSearch):a.oFeatures.bFilter?K(a,a.oPreviousSearch):(y(a),x(a))}function xa(a){var b=h("<div></div>")[0];a.nTable.parentNode.insertBefore(b,a.nTable);a.nTableWrapper=h('<div id="'+a.sTableId+'_wrapper" class="'+a.oClasses.sWrapper+'" role="grid"></div>')[0];a.nTableReinsertBefore=a.nTable.nextSibling;for(var c=a.nTableWrapper,d=a.sDom.split(""),i,f,g,e,w,o,k,m=0;m<d.length;m++){f=0;g=d[m];if("<"==g){e=h("<div></div>")[0];w=d[m+
+1];if("'"==w||'"'==w){o="";for(k=2;d[m+k]!=w;)o+=d[m+k],k++;"H"==o?o=a.oClasses.sJUIHeader:"F"==o&&(o=a.oClasses.sJUIFooter);-1!=o.indexOf(".")?(w=o.split("."),e.id=w[0].substr(1,w[0].length-1),e.className=w[1]):"#"==o.charAt(0)?e.id=o.substr(1,o.length-1):e.className=o;m+=k}c.appendChild(e);c=e}else if(">"==g)c=c.parentNode;else if("l"==g&&a.oFeatures.bPaginate&&a.oFeatures.bLengthChange)i=ya(a),f=1;else if("f"==g&&a.oFeatures.bFilter)i=za(a),f=1;else if("r"==g&&a.oFeatures.bProcessing)i=Aa(a),f=
+1;else if("t"==g)i=Ba(a),f=1;else if("i"==g&&a.oFeatures.bInfo)i=Ca(a),f=1;else if("p"==g&&a.oFeatures.bPaginate)i=Da(a),f=1;else if(0!==j.ext.aoFeatures.length){e=j.ext.aoFeatures;k=0;for(w=e.length;k<w;k++)if(g==e[k].cFeature){(i=e[k].fnInit(a))&&(f=1);break}}1==f&&null!==i&&("object"!==typeof a.aanFeatures[g]&&(a.aanFeatures[g]=[]),a.aanFeatures[g].push(i),c.appendChild(i))}b.parentNode.replaceChild(a.nTableWrapper,b)}function V(a,b){var c=h(b).children("tr"),d,i,f,g,e,j,o,k,m,p;a.splice(0,a.length);
+f=0;for(j=c.length;f<j;f++)a.push([]);f=0;for(j=c.length;f<j;f++){d=c[f];for(i=d.firstChild;i;){if("TD"==i.nodeName.toUpperCase()||"TH"==i.nodeName.toUpperCase()){k=1*i.getAttribute("colspan");m=1*i.getAttribute("rowspan");k=!k||0===k||1===k?1:k;m=!m||0===m||1===m?1:m;g=0;for(e=a[f];e[g];)g++;o=g;p=1===k?!0:!1;for(e=0;e<k;e++)for(g=0;g<m;g++)a[f+g][o+e]={cell:i,unique:p},a[f+g].nTr=d}i=i.nextSibling}}}function N(a,b,c){var d=[];c||(c=a.aoHeader,b&&(c=[],V(c,b)));for(var b=0,i=c.length;b<i;b++)for(var f=
+0,g=c[b].length;f<g;f++)if(c[b][f].unique&&(!d[f]||!a.bSortCellsTop))d[f]=c[b][f].cell;return d}function wa(a){if(a.bAjaxDataGet){a.iDraw++;E(a,!0);var b=Ea(a);ka(a,b);a.fnServerData.call(a.oInstance,a.sAjaxSource,b,function(b){Fa(a,b)},a);return!1}return!0}function Ea(a){var b=a.aoColumns.length,c=[],d,i,f,g;c.push({name:"sEcho",value:a.iDraw});c.push({name:"iColumns",value:b});c.push({name:"sColumns",value:M(a)});c.push({name:"iDisplayStart",value:a._iDisplayStart});c.push({name:"iDisplayLength",
+value:!1!==a.oFeatures.bPaginate?a._iDisplayLength:-1});for(f=0;f<b;f++)d=a.aoColumns[f].mData,c.push({name:"mDataProp_"+f,value:"function"===typeof d?"function":d});if(!1!==a.oFeatures.bFilter){c.push({name:"sSearch",value:a.oPreviousSearch.sSearch});c.push({name:"bRegex",value:a.oPreviousSearch.bRegex});for(f=0;f<b;f++)c.push({name:"sSearch_"+f,value:a.aoPreSearchCols[f].sSearch}),c.push({name:"bRegex_"+f,value:a.aoPreSearchCols[f].bRegex}),c.push({name:"bSearchable_"+f,value:a.aoColumns[f].bSearchable})}if(!1!==
+a.oFeatures.bSort){var e=0;d=null!==a.aaSortingFixed?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(f=0;f<d.length;f++){i=a.aoColumns[d[f][0]].aDataSort;for(g=0;g<i.length;g++)c.push({name:"iSortCol_"+e,value:i[g]}),c.push({name:"sSortDir_"+e,value:d[f][1]}),e++}c.push({name:"iSortingCols",value:e});for(f=0;f<b;f++)c.push({name:"bSortable_"+f,value:a.aoColumns[f].bSortable})}return c}function ka(a,b){A(a,"aoServerParams","serverParams",[b])}function Fa(a,b){if(b.sEcho!==n){if(1*b.sEcho<
+a.iDraw)return;a.iDraw=1*b.sEcho}(!a.oScroll.bInfinite||a.oScroll.bInfinite&&(a.bSorted||a.bFiltered))&&ga(a);a._iRecordsTotal=parseInt(b.iTotalRecords,10);a._iRecordsDisplay=parseInt(b.iTotalDisplayRecords,10);var c=M(a),c=b.sColumns!==n&&""!==c&&b.sColumns!=c,d;c&&(d=u(a,b.sColumns));for(var i=Q(a.sAjaxDataProp)(b),f=0,g=i.length;f<g;f++)if(c){for(var e=[],h=0,j=a.aoColumns.length;h<j;h++)e.push(i[f][d[h]]);H(a,e)}else H(a,i[f]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=!1;x(a);a.bAjaxDataGet=
+!0;E(a,!1)}function za(a){var b=a.oPreviousSearch,c=a.oLanguage.sSearch,c=-1!==c.indexOf("_INPUT_")?c.replace("_INPUT_",'<input type="text" />'):""===c?'<input type="text" />':c+' <input type="text" />',d=l.createElement("div");d.className=a.oClasses.sFilter;d.innerHTML="<label>"+c+"</label>";a.aanFeatures.f||(d.id=a.sTableId+"_filter");c=h('input[type="text"]',d);d._DT_Input=c[0];c.val(b.sSearch.replace('"',"&quot;"));c.bind("keyup.DT",function(){for(var c=a.aanFeatures.f,d=this.value===""?"":this.value,
+g=0,e=c.length;g<e;g++)c[g]!=h(this).parents("div.dataTables_filter")[0]&&h(c[g]._DT_Input).val(d);d!=b.sSearch&&K(a,{sSearch:d,bRegex:b.bRegex,bSmart:b.bSmart,bCaseInsensitive:b.bCaseInsensitive})});c.attr("aria-controls",a.sTableId).bind("keypress.DT",function(a){if(a.keyCode==13)return false});return d}function K(a,b,c){var d=a.oPreviousSearch,i=a.aoPreSearchCols,f=function(a){d.sSearch=a.sSearch;d.bRegex=a.bRegex;d.bSmart=a.bSmart;d.bCaseInsensitive=a.bCaseInsensitive};if(a.oFeatures.bServerSide)f(b);
+else{Ga(a,b.sSearch,c,b.bRegex,b.bSmart,b.bCaseInsensitive);f(b);for(b=0;b<a.aoPreSearchCols.length;b++)Ha(a,i[b].sSearch,b,i[b].bRegex,i[b].bSmart,i[b].bCaseInsensitive);Ia(a)}a.bFiltered=!0;h(a.oInstance).trigger("filter",a);a._iDisplayStart=0;y(a);x(a);la(a,0)}function Ia(a){for(var b=j.ext.afnFiltering,c=r(a,"bSearchable"),d=0,i=b.length;d<i;d++)for(var f=0,g=0,e=a.aiDisplay.length;g<e;g++){var h=a.aiDisplay[g-f];b[d](a,Y(a,h,"filter",c),h)||(a.aiDisplay.splice(g-f,1),f++)}}function Ha(a,b,c,
+d,i,f){if(""!==b)for(var g=0,b=ma(b,d,i,f),d=a.aiDisplay.length-1;0<=d;d--)i=Ja(v(a,a.aiDisplay[d],c,"filter"),a.aoColumns[c].sType),b.test(i)||(a.aiDisplay.splice(d,1),g++)}function Ga(a,b,c,d,i,f){d=ma(b,d,i,f);i=a.oPreviousSearch;c||(c=0);0!==j.ext.afnFiltering.length&&(c=1);if(0>=b.length)a.aiDisplay.splice(0,a.aiDisplay.length),a.aiDisplay=a.aiDisplayMaster.slice();else if(a.aiDisplay.length==a.aiDisplayMaster.length||i.sSearch.length>b.length||1==c||0!==b.indexOf(i.sSearch)){a.aiDisplay.splice(0,
+a.aiDisplay.length);la(a,1);for(b=0;b<a.aiDisplayMaster.length;b++)d.test(a.asDataSearch[b])&&a.aiDisplay.push(a.aiDisplayMaster[b])}else for(b=c=0;b<a.asDataSearch.length;b++)d.test(a.asDataSearch[b])||(a.aiDisplay.splice(b-c,1),c++)}function la(a,b){if(!a.oFeatures.bServerSide){a.asDataSearch=[];for(var c=r(a,"bSearchable"),d=1===b?a.aiDisplayMaster:a.aiDisplay,i=0,f=d.length;i<f;i++)a.asDataSearch[i]=na(a,Y(a,d[i],"filter",c))}}function na(a,b){var c=b.join("  ");-1!==c.indexOf("&")&&(c=h("<div>").html(c).text());
+return c.replace(/[\n\r]/g," ")}function ma(a,b,c,d){if(c)return a=b?a.split(" "):oa(a).split(" "),a="^(?=.*?"+a.join(")(?=.*?")+").*$",RegExp(a,d?"i":"");a=b?a:oa(a);return RegExp(a,d?"i":"")}function Ja(a,b){return"function"===typeof j.ext.ofnSearch[b]?j.ext.ofnSearch[b](a):null===a?"":"html"==b?a.replace(/[\r\n]/g," ").replace(/<.*?>/g,""):"string"===typeof a?a.replace(/[\r\n]/g," "):a}function oa(a){return a.replace(RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^|\\-)","g"),
+"\\$1")}function Ca(a){var b=l.createElement("div");b.className=a.oClasses.sInfo;a.aanFeatures.i||(a.aoDrawCallback.push({fn:Ka,sName:"information"}),b.id=a.sTableId+"_info");a.nTable.setAttribute("aria-describedby",a.sTableId+"_info");return b}function Ka(a){if(a.oFeatures.bInfo&&0!==a.aanFeatures.i.length){var b=a.oLanguage,c=a._iDisplayStart+1,d=a.fnDisplayEnd(),i=a.fnRecordsTotal(),f=a.fnRecordsDisplay(),g;g=0===f?b.sInfoEmpty:b.sInfo;f!=i&&(g+=" "+b.sInfoFiltered);g+=b.sInfoPostFix;g=ja(a,g);
+null!==b.fnInfoCallback&&(g=b.fnInfoCallback.call(a.oInstance,a,c,d,i,f,g));a=a.aanFeatures.i;b=0;for(c=a.length;b<c;b++)h(a[b]).html(g)}}function ja(a,b){var c=a.fnFormatNumber(a._iDisplayStart+1),d=a.fnDisplayEnd(),d=a.fnFormatNumber(d),i=a.fnRecordsDisplay(),i=a.fnFormatNumber(i),f=a.fnRecordsTotal(),f=a.fnFormatNumber(f);a.oScroll.bInfinite&&(c=a.fnFormatNumber(1));return b.replace(/_START_/g,c).replace(/_END_/g,d).replace(/_TOTAL_/g,i).replace(/_MAX_/g,f)}function ba(a){var b,c,d=a.iInitDisplayStart;
+if(!1===a.bInitialised)setTimeout(function(){ba(a)},200);else{xa(a);va(a);W(a,a.aoHeader);a.nTFoot&&W(a,a.aoFooter);E(a,!0);a.oFeatures.bAutoWidth&&da(a);b=0;for(c=a.aoColumns.length;b<c;b++)null!==a.aoColumns[b].sWidth&&(a.aoColumns[b].nTh.style.width=q(a.aoColumns[b].sWidth));a.oFeatures.bSort?O(a):a.oFeatures.bFilter?K(a,a.oPreviousSearch):(a.aiDisplay=a.aiDisplayMaster.slice(),y(a),x(a));null!==a.sAjaxSource&&!a.oFeatures.bServerSide?(c=[],ka(a,c),a.fnServerData.call(a.oInstance,a.sAjaxSource,
+c,function(c){var f=a.sAjaxDataProp!==""?Q(a.sAjaxDataProp)(c):c;for(b=0;b<f.length;b++)H(a,f[b]);a.iInitDisplayStart=d;if(a.oFeatures.bSort)O(a);else{a.aiDisplay=a.aiDisplayMaster.slice();y(a);x(a)}E(a,false);$(a,c)},a)):a.oFeatures.bServerSide||(E(a,!1),$(a))}}function $(a,b){a._bInitComplete=!0;A(a,"aoInitComplete","init",[a,b])}function pa(a){var b=j.defaults.oLanguage;!a.sEmptyTable&&(a.sZeroRecords&&"No data available in table"===b.sEmptyTable)&&p(a,a,"sZeroRecords","sEmptyTable");!a.sLoadingRecords&&
+(a.sZeroRecords&&"Loading..."===b.sLoadingRecords)&&p(a,a,"sZeroRecords","sLoadingRecords")}function ya(a){if(a.oScroll.bInfinite)return null;var b='<select size="1" '+('name="'+a.sTableId+'_length"')+">",c,d,i=a.aLengthMenu;if(2==i.length&&"object"===typeof i[0]&&"object"===typeof i[1]){c=0;for(d=i[0].length;c<d;c++)b+='<option value="'+i[0][c]+'">'+i[1][c]+"</option>"}else{c=0;for(d=i.length;c<d;c++)b+='<option value="'+i[c]+'">'+i[c]+"</option>"}b+="</select>";i=l.createElement("div");a.aanFeatures.l||
+(i.id=a.sTableId+"_length");i.className=a.oClasses.sLength;i.innerHTML="<label>"+a.oLanguage.sLengthMenu.replace("_MENU_",b)+"</label>";h('select option[value="'+a._iDisplayLength+'"]',i).attr("selected",!0);h("select",i).bind("change.DT",function(){var b=h(this).val(),i=a.aanFeatures.l;c=0;for(d=i.length;c<d;c++)i[c]!=this.parentNode&&h("select",i[c]).val(b);a._iDisplayLength=parseInt(b,10);y(a);if(a.fnDisplayEnd()==a.fnRecordsDisplay()){a._iDisplayStart=a.fnDisplayEnd()-a._iDisplayLength;if(a._iDisplayStart<
+0)a._iDisplayStart=0}if(a._iDisplayLength==-1)a._iDisplayStart=0;x(a)});h("select",i).attr("aria-controls",a.sTableId);return i}function y(a){a._iDisplayEnd=!1===a.oFeatures.bPaginate?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength>a.aiDisplay.length||-1==a._iDisplayLength?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength}function Da(a){if(a.oScroll.bInfinite)return null;var b=l.createElement("div");b.className=a.oClasses.sPaging+a.sPaginationType;j.ext.oPagination[a.sPaginationType].fnInit(a,
+b,function(a){y(a);x(a)});a.aanFeatures.p||a.aoDrawCallback.push({fn:function(a){j.ext.oPagination[a.sPaginationType].fnUpdate(a,function(a){y(a);x(a)})},sName:"pagination"});return b}function qa(a,b){var c=a._iDisplayStart;if("number"===typeof b)a._iDisplayStart=b*a._iDisplayLength,a._iDisplayStart>a.fnRecordsDisplay()&&(a._iDisplayStart=0);else if("first"==b)a._iDisplayStart=0;else if("previous"==b)a._iDisplayStart=0<=a._iDisplayLength?a._iDisplayStart-a._iDisplayLength:0,0>a._iDisplayStart&&(a._iDisplayStart=
+0);else if("next"==b)0<=a._iDisplayLength?a._iDisplayStart+a._iDisplayLength<a.fnRecordsDisplay()&&(a._iDisplayStart+=a._iDisplayLength):a._iDisplayStart=0;else if("last"==b)if(0<=a._iDisplayLength){var d=parseInt((a.fnRecordsDisplay()-1)/a._iDisplayLength,10)+1;a._iDisplayStart=(d-1)*a._iDisplayLength}else a._iDisplayStart=0;else D(a,0,"Unknown paging action: "+b);h(a.oInstance).trigger("page",a);return c!=a._iDisplayStart}function Aa(a){var b=l.createElement("div");a.aanFeatures.r||(b.id=a.sTableId+
+"_processing");b.innerHTML=a.oLanguage.sProcessing;b.className=a.oClasses.sProcessing;a.nTable.parentNode.insertBefore(b,a.nTable);return b}function E(a,b){if(a.oFeatures.bProcessing)for(var c=a.aanFeatures.r,d=0,i=c.length;d<i;d++)c[d].style.visibility=b?"visible":"hidden";h(a.oInstance).trigger("processing",[a,b])}function Ba(a){if(""===a.oScroll.sX&&""===a.oScroll.sY)return a.nTable;var b=l.createElement("div"),c=l.createElement("div"),d=l.createElement("div"),i=l.createElement("div"),f=l.createElement("div"),
+g=l.createElement("div"),e=a.nTable.cloneNode(!1),j=a.nTable.cloneNode(!1),o=a.nTable.getElementsByTagName("thead")[0],k=0===a.nTable.getElementsByTagName("tfoot").length?null:a.nTable.getElementsByTagName("tfoot")[0],m=a.oClasses;c.appendChild(d);f.appendChild(g);i.appendChild(a.nTable);b.appendChild(c);b.appendChild(i);d.appendChild(e);e.appendChild(o);null!==k&&(b.appendChild(f),g.appendChild(j),j.appendChild(k));b.className=m.sScrollWrapper;c.className=m.sScrollHead;d.className=m.sScrollHeadInner;
+i.className=m.sScrollBody;f.className=m.sScrollFoot;g.className=m.sScrollFootInner;a.oScroll.bAutoCss&&(c.style.overflow="hidden",c.style.position="relative",f.style.overflow="hidden",i.style.overflow="auto");c.style.border="0";c.style.width="100%";f.style.border="0";d.style.width=""!==a.oScroll.sXInner?a.oScroll.sXInner:"100%";e.removeAttribute("id");e.style.marginLeft="0";a.nTable.style.marginLeft="0";null!==k&&(j.removeAttribute("id"),j.style.marginLeft="0");d=h(a.nTable).children("caption");0<
+d.length&&(d=d[0],"top"===d._captionSide?e.appendChild(d):"bottom"===d._captionSide&&k&&j.appendChild(d));""!==a.oScroll.sX&&(c.style.width=q(a.oScroll.sX),i.style.width=q(a.oScroll.sX),null!==k&&(f.style.width=q(a.oScroll.sX)),h(i).scroll(function(){c.scrollLeft=this.scrollLeft;if(k!==null)f.scrollLeft=this.scrollLeft}));""!==a.oScroll.sY&&(i.style.height=q(a.oScroll.sY));a.aoDrawCallback.push({fn:La,sName:"scrolling"});a.oScroll.bInfinite&&h(i).scroll(function(){if(!a.bDrawing&&h(this).scrollTop()!==
+0&&h(this).scrollTop()+h(this).height()>h(a.nTable).height()-a.oScroll.iLoadGap&&a.fnDisplayEnd()<a.fnRecordsDisplay()){qa(a,"next");y(a);x(a)}});a.nScrollHead=c;a.nScrollFoot=f;return b}function La(a){var b=a.nScrollHead.getElementsByTagName("div")[0],c=b.getElementsByTagName("table")[0],d=a.nTable.parentNode,i,f,g,e,j,o,k,m,p=[],n=[],l=null!==a.nTFoot?a.nScrollFoot.getElementsByTagName("div")[0]:null,R=null!==a.nTFoot?l.getElementsByTagName("table")[0]:null,r=a.oBrowser.bScrollOversize,s=function(a){k=
+a.style;k.paddingTop="0";k.paddingBottom="0";k.borderTopWidth="0";k.borderBottomWidth="0";k.height=0};h(a.nTable).children("thead, tfoot").remove();i=h(a.nTHead).clone()[0];a.nTable.insertBefore(i,a.nTable.childNodes[0]);g=a.nTHead.getElementsByTagName("tr");e=i.getElementsByTagName("tr");null!==a.nTFoot&&(j=h(a.nTFoot).clone()[0],a.nTable.insertBefore(j,a.nTable.childNodes[1]),o=a.nTFoot.getElementsByTagName("tr"),j=j.getElementsByTagName("tr"));""===a.oScroll.sX&&(d.style.width="100%",b.parentNode.style.width=
+"100%");var t=N(a,i);i=0;for(f=t.length;i<f;i++)m=G(a,i),t[i].style.width=a.aoColumns[m].sWidth;null!==a.nTFoot&&C(function(a){a.style.width=""},j);a.oScroll.bCollapse&&""!==a.oScroll.sY&&(d.style.height=d.offsetHeight+a.nTHead.offsetHeight+"px");i=h(a.nTable).outerWidth();if(""===a.oScroll.sX){if(a.nTable.style.width="100%",r&&(h("tbody",d).height()>d.offsetHeight||"scroll"==h(d).css("overflow-y")))a.nTable.style.width=q(h(a.nTable).outerWidth()-a.oScroll.iBarWidth)}else""!==a.oScroll.sXInner?a.nTable.style.width=
+q(a.oScroll.sXInner):i==h(d).width()&&h(d).height()<h(a.nTable).height()?(a.nTable.style.width=q(i-a.oScroll.iBarWidth),h(a.nTable).outerWidth()>i-a.oScroll.iBarWidth&&(a.nTable.style.width=q(i))):a.nTable.style.width=q(i);i=h(a.nTable).outerWidth();C(s,e);C(function(a){p.push(q(h(a).width()))},e);C(function(a,b){a.style.width=p[b]},g);h(e).height(0);null!==a.nTFoot&&(C(s,j),C(function(a){n.push(q(h(a).width()))},j),C(function(a,b){a.style.width=n[b]},o),h(j).height(0));C(function(a,b){a.innerHTML=
+"";a.style.width=p[b]},e);null!==a.nTFoot&&C(function(a,b){a.innerHTML="";a.style.width=n[b]},j);if(h(a.nTable).outerWidth()<i){g=d.scrollHeight>d.offsetHeight||"scroll"==h(d).css("overflow-y")?i+a.oScroll.iBarWidth:i;if(r&&(d.scrollHeight>d.offsetHeight||"scroll"==h(d).css("overflow-y")))a.nTable.style.width=q(g-a.oScroll.iBarWidth);d.style.width=q(g);a.nScrollHead.style.width=q(g);null!==a.nTFoot&&(a.nScrollFoot.style.width=q(g));""===a.oScroll.sX?D(a,1,"The table cannot fit into the current element which will cause column misalignment. The table has been drawn at its minimum possible width."):
+""!==a.oScroll.sXInner&&D(a,1,"The table cannot fit into the current element which will cause column misalignment. Increase the sScrollXInner value or remove it to allow automatic calculation")}else d.style.width=q("100%"),a.nScrollHead.style.width=q("100%"),null!==a.nTFoot&&(a.nScrollFoot.style.width=q("100%"));""===a.oScroll.sY&&r&&(d.style.height=q(a.nTable.offsetHeight+a.oScroll.iBarWidth));""!==a.oScroll.sY&&a.oScroll.bCollapse&&(d.style.height=q(a.oScroll.sY),r=""!==a.oScroll.sX&&a.nTable.offsetWidth>
+d.offsetWidth?a.oScroll.iBarWidth:0,a.nTable.offsetHeight<d.offsetHeight&&(d.style.height=q(a.nTable.offsetHeight+r)));r=h(a.nTable).outerWidth();c.style.width=q(r);b.style.width=q(r);c=h(a.nTable).height()>d.clientHeight||"scroll"==h(d).css("overflow-y");b.style.paddingRight=c?a.oScroll.iBarWidth+"px":"0px";null!==a.nTFoot&&(R.style.width=q(r),l.style.width=q(r),l.style.paddingRight=c?a.oScroll.iBarWidth+"px":"0px");h(d).scroll();if(a.bSorted||a.bFiltered)d.scrollTop=0}function C(a,b,c){for(var d=
+0,i=0,f=b.length,g,e;i<f;){g=b[i].firstChild;for(e=c?c[i].firstChild:null;g;)1===g.nodeType&&(c?a(g,e,d):a(g,d),d++),g=g.nextSibling,e=c?e.nextSibling:null;i++}}function Ma(a,b){if(!a||null===a||""===a)return 0;b||(b=l.body);var c,d=l.createElement("div");d.style.width=q(a);b.appendChild(d);c=d.offsetWidth;b.removeChild(d);return c}function da(a){var b=0,c,d=0,i=a.aoColumns.length,f,e,j=h("th",a.nTHead),o=a.nTable.getAttribute("width");e=a.nTable.parentNode;for(f=0;f<i;f++)a.aoColumns[f].bVisible&&
+(d++,null!==a.aoColumns[f].sWidth&&(c=Ma(a.aoColumns[f].sWidthOrig,e),null!==c&&(a.aoColumns[f].sWidth=q(c)),b++));if(i==j.length&&0===b&&d==i&&""===a.oScroll.sX&&""===a.oScroll.sY)for(f=0;f<a.aoColumns.length;f++)c=h(j[f]).width(),null!==c&&(a.aoColumns[f].sWidth=q(c));else{b=a.nTable.cloneNode(!1);f=a.nTHead.cloneNode(!0);d=l.createElement("tbody");c=l.createElement("tr");b.removeAttribute("id");b.appendChild(f);null!==a.nTFoot&&(b.appendChild(a.nTFoot.cloneNode(!0)),C(function(a){a.style.width=
+""},b.getElementsByTagName("tr")));b.appendChild(d);d.appendChild(c);d=h("thead th",b);0===d.length&&(d=h("tbody tr:eq(0)>td",b));j=N(a,f);for(f=d=0;f<i;f++){var k=a.aoColumns[f];k.bVisible&&null!==k.sWidthOrig&&""!==k.sWidthOrig?j[f-d].style.width=q(k.sWidthOrig):k.bVisible?j[f-d].style.width="":d++}for(f=0;f<i;f++)a.aoColumns[f].bVisible&&(d=Na(a,f),null!==d&&(d=d.cloneNode(!0),""!==a.aoColumns[f].sContentPadding&&(d.innerHTML+=a.aoColumns[f].sContentPadding),c.appendChild(d)));e.appendChild(b);
+""!==a.oScroll.sX&&""!==a.oScroll.sXInner?b.style.width=q(a.oScroll.sXInner):""!==a.oScroll.sX?(b.style.width="",h(b).width()<e.offsetWidth&&(b.style.width=q(e.offsetWidth))):""!==a.oScroll.sY?b.style.width=q(e.offsetWidth):o&&(b.style.width=q(o));b.style.visibility="hidden";Oa(a,b);i=h("tbody tr:eq(0)",b).children();0===i.length&&(i=N(a,h("thead",b)[0]));if(""!==a.oScroll.sX){for(f=d=e=0;f<a.aoColumns.length;f++)a.aoColumns[f].bVisible&&(e=null===a.aoColumns[f].sWidthOrig?e+h(i[d]).outerWidth():
+e+(parseInt(a.aoColumns[f].sWidth.replace("px",""),10)+(h(i[d]).outerWidth()-h(i[d]).width())),d++);b.style.width=q(e);a.nTable.style.width=q(e)}for(f=d=0;f<a.aoColumns.length;f++)a.aoColumns[f].bVisible&&(e=h(i[d]).width(),null!==e&&0<e&&(a.aoColumns[f].sWidth=q(e)),d++);i=h(b).css("width");a.nTable.style.width=-1!==i.indexOf("%")?i:q(h(b).outerWidth());b.parentNode.removeChild(b)}o&&(a.nTable.style.width=q(o))}function Oa(a,b){""===a.oScroll.sX&&""!==a.oScroll.sY?(h(b).width(),b.style.width=q(h(b).outerWidth()-
+a.oScroll.iBarWidth)):""!==a.oScroll.sX&&(b.style.width=q(h(b).outerWidth()))}function Na(a,b){var c=Pa(a,b);if(0>c)return null;if(null===a.aoData[c].nTr){var d=l.createElement("td");d.innerHTML=v(a,c,b,"");return d}return J(a,c)[b]}function Pa(a,b){for(var c=-1,d=-1,i=0;i<a.aoData.length;i++){var e=v(a,i,b,"display")+"",e=e.replace(/<.*?>/g,"");e.length>c&&(c=e.length,d=i)}return d}function q(a){if(null===a)return"0px";if("number"==typeof a)return 0>a?"0px":a+"px";var b=a.charCodeAt(a.length-1);
+return 48>b||57<b?a:a+"px"}function Qa(){var a=l.createElement("p"),b=a.style;b.width="100%";b.height="200px";b.padding="0px";var c=l.createElement("div"),b=c.style;b.position="absolute";b.top="0px";b.left="0px";b.visibility="hidden";b.width="200px";b.height="150px";b.padding="0px";b.overflow="hidden";c.appendChild(a);l.body.appendChild(c);b=a.offsetWidth;c.style.overflow="scroll";a=a.offsetWidth;b==a&&(a=c.clientWidth);l.body.removeChild(c);return b-a}function O(a,b){var c,d,i,e,g,k,o=[],m=[],p=
+j.ext.oSort,l=a.aoData,q=a.aoColumns,G=a.oLanguage.oAria;if(!a.oFeatures.bServerSide&&(0!==a.aaSorting.length||null!==a.aaSortingFixed)){o=null!==a.aaSortingFixed?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(c=0;c<o.length;c++)if(d=o[c][0],i=R(a,d),e=a.aoColumns[d].sSortDataType,j.ext.afnSortData[e])if(g=j.ext.afnSortData[e].call(a.oInstance,a,d,i),g.length===l.length){i=0;for(e=l.length;i<e;i++)F(a,i,d,g[i])}else D(a,0,"Returned data sort array (col "+d+") is the wrong length");c=
+0;for(d=a.aiDisplayMaster.length;c<d;c++)m[a.aiDisplayMaster[c]]=c;var r=o.length,s;c=0;for(d=l.length;c<d;c++)for(i=0;i<r;i++){s=q[o[i][0]].aDataSort;g=0;for(k=s.length;g<k;g++)e=q[s[g]].sType,e=p[(e?e:"string")+"-pre"],l[c]._aSortData[s[g]]=e?e(v(a,c,s[g],"sort")):v(a,c,s[g],"sort")}a.aiDisplayMaster.sort(function(a,b){var c,d,e,i,f;for(c=0;c<r;c++){f=q[o[c][0]].aDataSort;d=0;for(e=f.length;d<e;d++)if(i=q[f[d]].sType,i=p[(i?i:"string")+"-"+o[c][1]](l[a]._aSortData[f[d]],l[b]._aSortData[f[d]]),0!==
+i)return i}return p["numeric-asc"](m[a],m[b])})}(b===n||b)&&!a.oFeatures.bDeferRender&&P(a);c=0;for(d=a.aoColumns.length;c<d;c++)e=q[c].sTitle.replace(/<.*?>/g,""),i=q[c].nTh,i.removeAttribute("aria-sort"),i.removeAttribute("aria-label"),q[c].bSortable?0<o.length&&o[0][0]==c?(i.setAttribute("aria-sort","asc"==o[0][1]?"ascending":"descending"),i.setAttribute("aria-label",e+("asc"==(q[c].asSorting[o[0][2]+1]?q[c].asSorting[o[0][2]+1]:q[c].asSorting[0])?G.sSortAscending:G.sSortDescending))):i.setAttribute("aria-label",
+e+("asc"==q[c].asSorting[0]?G.sSortAscending:G.sSortDescending)):i.setAttribute("aria-label",e);a.bSorted=!0;h(a.oInstance).trigger("sort",a);a.oFeatures.bFilter?K(a,a.oPreviousSearch,1):(a.aiDisplay=a.aiDisplayMaster.slice(),a._iDisplayStart=0,y(a),x(a))}function ia(a,b,c,d){Ra(b,{},function(b){if(!1!==a.aoColumns[c].bSortable){var e=function(){var d,e;if(b.shiftKey){for(var f=!1,h=0;h<a.aaSorting.length;h++)if(a.aaSorting[h][0]==c){f=!0;d=a.aaSorting[h][0];e=a.aaSorting[h][2]+1;a.aoColumns[d].asSorting[e]?
+(a.aaSorting[h][1]=a.aoColumns[d].asSorting[e],a.aaSorting[h][2]=e):a.aaSorting.splice(h,1);break}!1===f&&a.aaSorting.push([c,a.aoColumns[c].asSorting[0],0])}else 1==a.aaSorting.length&&a.aaSorting[0][0]==c?(d=a.aaSorting[0][0],e=a.aaSorting[0][2]+1,a.aoColumns[d].asSorting[e]||(e=0),a.aaSorting[0][1]=a.aoColumns[d].asSorting[e],a.aaSorting[0][2]=e):(a.aaSorting.splice(0,a.aaSorting.length),a.aaSorting.push([c,a.aoColumns[c].asSorting[0],0]));O(a)};a.oFeatures.bProcessing?(E(a,!0),setTimeout(function(){e();
+a.oFeatures.bServerSide||E(a,!1)},0)):e();"function"==typeof d&&d(a)}})}function P(a){var b,c,d,e,f,g=a.aoColumns.length,j=a.oClasses;for(b=0;b<g;b++)a.aoColumns[b].bSortable&&h(a.aoColumns[b].nTh).removeClass(j.sSortAsc+" "+j.sSortDesc+" "+a.aoColumns[b].sSortingClass);c=null!==a.aaSortingFixed?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable){f=a.aoColumns[b].sSortingClass;e=-1;for(d=0;d<c.length;d++)if(c[d][0]==b){f="asc"==c[d][1]?
+j.sSortAsc:j.sSortDesc;e=d;break}h(a.aoColumns[b].nTh).addClass(f);a.bJUI&&(f=h("span."+j.sSortIcon,a.aoColumns[b].nTh),f.removeClass(j.sSortJUIAsc+" "+j.sSortJUIDesc+" "+j.sSortJUI+" "+j.sSortJUIAscAllowed+" "+j.sSortJUIDescAllowed),f.addClass(-1==e?a.aoColumns[b].sSortingClassJUI:"asc"==c[e][1]?j.sSortJUIAsc:j.sSortJUIDesc))}else h(a.aoColumns[b].nTh).addClass(a.aoColumns[b].sSortingClass);f=j.sSortColumn;if(a.oFeatures.bSort&&a.oFeatures.bSortClasses){a=J(a);e=[];for(b=0;b<g;b++)e.push("");b=0;
+for(d=1;b<c.length;b++)j=parseInt(c[b][0],10),e[j]=f+d,3>d&&d++;f=RegExp(f+"[123]");var o;b=0;for(c=a.length;b<c;b++)j=b%g,d=a[b].className,o=e[j],j=d.replace(f,o),j!=d?a[b].className=h.trim(j):0<o.length&&-1==d.indexOf(o)&&(a[b].className=d+" "+o)}}function ra(a){if(a.oFeatures.bStateSave&&!a.bDestroying){var b,c;b=a.oScroll.bInfinite;var d={iCreate:(new Date).getTime(),iStart:b?0:a._iDisplayStart,iEnd:b?a._iDisplayLength:a._iDisplayEnd,iLength:a._iDisplayLength,aaSorting:h.extend(!0,[],a.aaSorting),
+oSearch:h.extend(!0,{},a.oPreviousSearch),aoSearchCols:h.extend(!0,[],a.aoPreSearchCols),abVisCols:[]};b=0;for(c=a.aoColumns.length;b<c;b++)d.abVisCols.push(a.aoColumns[b].bVisible);A(a,"aoStateSaveParams","stateSaveParams",[a,d]);a.fnStateSave.call(a.oInstance,a,d)}}function Sa(a,b){if(a.oFeatures.bStateSave){var c=a.fnStateLoad.call(a.oInstance,a);if(c){var d=A(a,"aoStateLoadParams","stateLoadParams",[a,c]);if(-1===h.inArray(!1,d)){a.oLoadedState=h.extend(!0,{},c);a._iDisplayStart=c.iStart;a.iInitDisplayStart=
+c.iStart;a._iDisplayEnd=c.iEnd;a._iDisplayLength=c.iLength;a.aaSorting=c.aaSorting.slice();a.saved_aaSorting=c.aaSorting.slice();h.extend(a.oPreviousSearch,c.oSearch);h.extend(!0,a.aoPreSearchCols,c.aoSearchCols);b.saved_aoColumns=[];for(d=0;d<c.abVisCols.length;d++)b.saved_aoColumns[d]={},b.saved_aoColumns[d].bVisible=c.abVisCols[d];A(a,"aoStateLoaded","stateLoaded",[a,c])}}}}function s(a){for(var b=0;b<j.settings.length;b++)if(j.settings[b].nTable===a)return j.settings[b];return null}function T(a){for(var b=
+[],a=a.aoData,c=0,d=a.length;c<d;c++)null!==a[c].nTr&&b.push(a[c].nTr);return b}function J(a,b){var c=[],d,e,f,g,h,j;e=0;var o=a.aoData.length;b!==n&&(e=b,o=b+1);for(f=e;f<o;f++)if(j=a.aoData[f],null!==j.nTr){e=[];for(d=j.nTr.firstChild;d;)g=d.nodeName.toLowerCase(),("td"==g||"th"==g)&&e.push(d),d=d.nextSibling;g=d=0;for(h=a.aoColumns.length;g<h;g++)a.aoColumns[g].bVisible?c.push(e[g-d]):(c.push(j._anHidden[g]),d++)}return c}function D(a,b,c){a=null===a?"DataTables warning: "+c:"DataTables warning (table id = '"+
+a.sTableId+"'): "+c;if(0===b)if("alert"==j.ext.sErrMode)alert(a);else throw Error(a);else X.console&&console.log&&console.log(a)}function p(a,b,c,d){d===n&&(d=c);b[c]!==n&&(a[d]=b[c])}function Ta(a,b){var c,d;for(d in b)b.hasOwnProperty(d)&&(c=b[d],"object"===typeof e[d]&&null!==c&&!1===h.isArray(c)?h.extend(!0,a[d],c):a[d]=c);return a}function Ra(a,b,c){h(a).bind("click.DT",b,function(b){a.blur();c(b)}).bind("keypress.DT",b,function(a){13===a.which&&c(a)}).bind("selectstart.DT",function(){return!1})}
+function z(a,b,c,d){c&&a[b].push({fn:c,sName:d})}function A(a,b,c,d){for(var b=a[b],e=[],f=b.length-1;0<=f;f--)e.push(b[f].fn.apply(a.oInstance,d));null!==c&&h(a.oInstance).trigger(c,d);return e}function Ua(a){var b=h('<div style="position:absolute; top:0; left:0; height:1px; width:1px; overflow:hidden"><div style="position:absolute; top:1px; left:1px; width:100px; overflow:scroll;"><div id="DT_BrowserTest" style="width:100%; height:10px;"></div></div></div>')[0];l.body.appendChild(b);a.oBrowser.bScrollOversize=
+100===h("#DT_BrowserTest",b)[0].offsetWidth?!0:!1;l.body.removeChild(b)}function Va(a){return function(){var b=[s(this[j.ext.iApiIndex])].concat(Array.prototype.slice.call(arguments));return j.ext.oApi[a].apply(this,b)}}var U=/\[.*?\]$/,Wa=X.JSON?JSON.stringify:function(a){var b=typeof a;if("object"!==b||null===a)return"string"===b&&(a='"'+a+'"'),a+"";var c,d,e=[],f=h.isArray(a);for(c in a)d=a[c],b=typeof d,"string"===b?d='"'+d+'"':"object"===b&&null!==d&&(d=Wa(d)),e.push((f?"":'"'+c+'":')+d);return(f?
+"[":"{")+e+(f?"]":"}")};this.$=function(a,b){var c,d,e=[],f;d=s(this[j.ext.iApiIndex]);var g=d.aoData,o=d.aiDisplay,k=d.aiDisplayMaster;b||(b={});b=h.extend({},{filter:"none",order:"current",page:"all"},b);if("current"==b.page){c=d._iDisplayStart;for(d=d.fnDisplayEnd();c<d;c++)(f=g[o[c]].nTr)&&e.push(f)}else if("current"==b.order&&"none"==b.filter){c=0;for(d=k.length;c<d;c++)(f=g[k[c]].nTr)&&e.push(f)}else if("current"==b.order&&"applied"==b.filter){c=0;for(d=o.length;c<d;c++)(f=g[o[c]].nTr)&&e.push(f)}else if("original"==
+b.order&&"none"==b.filter){c=0;for(d=g.length;c<d;c++)(f=g[c].nTr)&&e.push(f)}else if("original"==b.order&&"applied"==b.filter){c=0;for(d=g.length;c<d;c++)f=g[c].nTr,-1!==h.inArray(c,o)&&f&&e.push(f)}else D(d,1,"Unknown selection options");e=h(e);c=e.filter(a);e=e.find(a);return h([].concat(h.makeArray(c),h.makeArray(e)))};this._=function(a,b){var c=[],d,e,f=this.$(a,b);d=0;for(e=f.length;d<e;d++)c.push(this.fnGetData(f[d]));return c};this.fnAddData=function(a,b){if(0===a.length)return[];var c=[],
+d,e=s(this[j.ext.iApiIndex]);if("object"===typeof a[0]&&null!==a[0])for(var f=0;f<a.length;f++){d=H(e,a[f]);if(-1==d)return c;c.push(d)}else{d=H(e,a);if(-1==d)return c;c.push(d)}e.aiDisplay=e.aiDisplayMaster.slice();(b===n||b)&&aa(e);return c};this.fnAdjustColumnSizing=function(a){var b=s(this[j.ext.iApiIndex]);k(b);a===n||a?this.fnDraw(!1):(""!==b.oScroll.sX||""!==b.oScroll.sY)&&this.oApi._fnScrollDraw(b)};this.fnClearTable=function(a){var b=s(this[j.ext.iApiIndex]);ga(b);(a===n||a)&&x(b)};this.fnClose=
+function(a){for(var b=s(this[j.ext.iApiIndex]),c=0;c<b.aoOpenRows.length;c++)if(b.aoOpenRows[c].nParent==a)return(a=b.aoOpenRows[c].nTr.parentNode)&&a.removeChild(b.aoOpenRows[c].nTr),b.aoOpenRows.splice(c,1),0;return 1};this.fnDeleteRow=function(a,b,c){var d=s(this[j.ext.iApiIndex]),e,f,a="object"===typeof a?I(d,a):a,g=d.aoData.splice(a,1);e=0;for(f=d.aoData.length;e<f;e++)null!==d.aoData[e].nTr&&(d.aoData[e].nTr._DT_RowIndex=e);e=h.inArray(a,d.aiDisplay);d.asDataSearch.splice(e,1);ha(d.aiDisplayMaster,
+a);ha(d.aiDisplay,a);"function"===typeof b&&b.call(this,d,g);d._iDisplayStart>=d.fnRecordsDisplay()&&(d._iDisplayStart-=d._iDisplayLength,0>d._iDisplayStart&&(d._iDisplayStart=0));if(c===n||c)y(d),x(d);return g};this.fnDestroy=function(a){var b=s(this[j.ext.iApiIndex]),c=b.nTableWrapper.parentNode,d=b.nTBody,i,f,a=a===n?!1:a;b.bDestroying=!0;A(b,"aoDestroyCallback","destroy",[b]);if(!a){i=0;for(f=b.aoColumns.length;i<f;i++)!1===b.aoColumns[i].bVisible&&this.fnSetColumnVis(i,!0)}h(b.nTableWrapper).find("*").andSelf().unbind(".DT");
+h("tbody>tr>td."+b.oClasses.sRowEmpty,b.nTable).parent().remove();b.nTable!=b.nTHead.parentNode&&(h(b.nTable).children("thead").remove(),b.nTable.appendChild(b.nTHead));b.nTFoot&&b.nTable!=b.nTFoot.parentNode&&(h(b.nTable).children("tfoot").remove(),b.nTable.appendChild(b.nTFoot));b.nTable.parentNode.removeChild(b.nTable);h(b.nTableWrapper).remove();b.aaSorting=[];b.aaSortingFixed=[];P(b);h(T(b)).removeClass(b.asStripeClasses.join(" "));h("th, td",b.nTHead).removeClass([b.oClasses.sSortable,b.oClasses.sSortableAsc,
+b.oClasses.sSortableDesc,b.oClasses.sSortableNone].join(" "));b.bJUI&&(h("th span."+b.oClasses.sSortIcon+", td span."+b.oClasses.sSortIcon,b.nTHead).remove(),h("th, td",b.nTHead).each(function(){var a=h("div."+b.oClasses.sSortJUIWrapper,this),c=a.contents();h(this).append(c);a.remove()}));!a&&b.nTableReinsertBefore?c.insertBefore(b.nTable,b.nTableReinsertBefore):a||c.appendChild(b.nTable);i=0;for(f=b.aoData.length;i<f;i++)null!==b.aoData[i].nTr&&d.appendChild(b.aoData[i].nTr);!0===b.oFeatures.bAutoWidth&&
+(b.nTable.style.width=q(b.sDestroyWidth));if(f=b.asDestroyStripes.length){a=h(d).children("tr");for(i=0;i<f;i++)a.filter(":nth-child("+f+"n + "+i+")").addClass(b.asDestroyStripes[i])}i=0;for(f=j.settings.length;i<f;i++)j.settings[i]==b&&j.settings.splice(i,1);e=b=null};this.fnDraw=function(a){var b=s(this[j.ext.iApiIndex]);!1===a?(y(b),x(b)):aa(b)};this.fnFilter=function(a,b,c,d,e,f){var g=s(this[j.ext.iApiIndex]);if(g.oFeatures.bFilter){if(c===n||null===c)c=!1;if(d===n||null===d)d=!0;if(e===n||null===
+e)e=!0;if(f===n||null===f)f=!0;if(b===n||null===b){if(K(g,{sSearch:a+"",bRegex:c,bSmart:d,bCaseInsensitive:f},1),e&&g.aanFeatures.f){b=g.aanFeatures.f;c=0;for(d=b.length;c<d;c++)try{b[c]._DT_Input!=l.activeElement&&h(b[c]._DT_Input).val(a)}catch(o){h(b[c]._DT_Input).val(a)}}}else h.extend(g.aoPreSearchCols[b],{sSearch:a+"",bRegex:c,bSmart:d,bCaseInsensitive:f}),K(g,g.oPreviousSearch,1)}};this.fnGetData=function(a,b){var c=s(this[j.ext.iApiIndex]);if(a!==n){var d=a;if("object"===typeof a){var e=a.nodeName.toLowerCase();
+"tr"===e?d=I(c,a):"td"===e&&(d=I(c,a.parentNode),b=fa(c,d,a))}return b!==n?v(c,d,b,""):c.aoData[d]!==n?c.aoData[d]._aData:null}return Z(c)};this.fnGetNodes=function(a){var b=s(this[j.ext.iApiIndex]);return a!==n?b.aoData[a]!==n?b.aoData[a].nTr:null:T(b)};this.fnGetPosition=function(a){var b=s(this[j.ext.iApiIndex]),c=a.nodeName.toUpperCase();return"TR"==c?I(b,a):"TD"==c||"TH"==c?(c=I(b,a.parentNode),a=fa(b,c,a),[c,R(b,a),a]):null};this.fnIsOpen=function(a){for(var b=s(this[j.ext.iApiIndex]),c=0;c<
+b.aoOpenRows.length;c++)if(b.aoOpenRows[c].nParent==a)return!0;return!1};this.fnOpen=function(a,b,c){var d=s(this[j.ext.iApiIndex]),e=T(d);if(-1!==h.inArray(a,e)){this.fnClose(a);var e=l.createElement("tr"),f=l.createElement("td");e.appendChild(f);f.className=c;f.colSpan=t(d);"string"===typeof b?f.innerHTML=b:h(f).html(b);b=h("tr",d.nTBody);-1!=h.inArray(a,b)&&h(e).insertAfter(a);d.aoOpenRows.push({nTr:e,nParent:a});return e}};this.fnPageChange=function(a,b){var c=s(this[j.ext.iApiIndex]);qa(c,a);
+y(c);(b===n||b)&&x(c)};this.fnSetColumnVis=function(a,b,c){var d=s(this[j.ext.iApiIndex]),e,f,g=d.aoColumns,h=d.aoData,o,m;if(g[a].bVisible!=b){if(b){for(e=f=0;e<a;e++)g[e].bVisible&&f++;m=f>=t(d);if(!m)for(e=a;e<g.length;e++)if(g[e].bVisible){o=e;break}e=0;for(f=h.length;e<f;e++)null!==h[e].nTr&&(m?h[e].nTr.appendChild(h[e]._anHidden[a]):h[e].nTr.insertBefore(h[e]._anHidden[a],J(d,e)[o]))}else{e=0;for(f=h.length;e<f;e++)null!==h[e].nTr&&(o=J(d,e)[a],h[e]._anHidden[a]=o,o.parentNode.removeChild(o))}g[a].bVisible=
+b;W(d,d.aoHeader);d.nTFoot&&W(d,d.aoFooter);e=0;for(f=d.aoOpenRows.length;e<f;e++)d.aoOpenRows[e].nTr.colSpan=t(d);if(c===n||c)k(d),x(d);ra(d)}};this.fnSettings=function(){return s(this[j.ext.iApiIndex])};this.fnSort=function(a){var b=s(this[j.ext.iApiIndex]);b.aaSorting=a;O(b)};this.fnSortListener=function(a,b,c){ia(s(this[j.ext.iApiIndex]),a,b,c)};this.fnUpdate=function(a,b,c,d,e){var f=s(this[j.ext.iApiIndex]),b="object"===typeof b?I(f,b):b;if(h.isArray(a)&&c===n){f.aoData[b]._aData=a.slice();
+for(c=0;c<f.aoColumns.length;c++)this.fnUpdate(v(f,b,c),b,c,!1,!1)}else if(h.isPlainObject(a)&&c===n){f.aoData[b]._aData=h.extend(!0,{},a);for(c=0;c<f.aoColumns.length;c++)this.fnUpdate(v(f,b,c),b,c,!1,!1)}else{F(f,b,c,a);var a=v(f,b,c,"display"),g=f.aoColumns[c];null!==g.fnRender&&(a=S(f,b,c),g.bUseRendered&&F(f,b,c,a));null!==f.aoData[b].nTr&&(J(f,b)[c].innerHTML=a)}c=h.inArray(b,f.aiDisplay);f.asDataSearch[c]=na(f,Y(f,b,"filter",r(f,"bSearchable")));(e===n||e)&&k(f);(d===n||d)&&aa(f);return 0};
+this.fnVersionCheck=j.ext.fnVersionCheck;this.oApi={_fnExternApiFunc:Va,_fnInitialise:ba,_fnInitComplete:$,_fnLanguageCompat:pa,_fnAddColumn:o,_fnColumnOptions:m,_fnAddData:H,_fnCreateTr:ea,_fnGatherData:ua,_fnBuildHead:va,_fnDrawHead:W,_fnDraw:x,_fnReDraw:aa,_fnAjaxUpdate:wa,_fnAjaxParameters:Ea,_fnAjaxUpdateDraw:Fa,_fnServerParams:ka,_fnAddOptionsHtml:xa,_fnFeatureHtmlTable:Ba,_fnScrollDraw:La,_fnAdjustColumnSizing:k,_fnFeatureHtmlFilter:za,_fnFilterComplete:K,_fnFilterCustom:Ia,_fnFilterColumn:Ha,
+_fnFilter:Ga,_fnBuildSearchArray:la,_fnBuildSearchRow:na,_fnFilterCreateSearch:ma,_fnDataToSearch:Ja,_fnSort:O,_fnSortAttachListener:ia,_fnSortingClasses:P,_fnFeatureHtmlPaginate:Da,_fnPageChange:qa,_fnFeatureHtmlInfo:Ca,_fnUpdateInfo:Ka,_fnFeatureHtmlLength:ya,_fnFeatureHtmlProcessing:Aa,_fnProcessingDisplay:E,_fnVisibleToColumnIndex:G,_fnColumnIndexToVisible:R,_fnNodeToDataIndex:I,_fnVisbleColumns:t,_fnCalculateEnd:y,_fnConvertToWidth:Ma,_fnCalculateColumnWidths:da,_fnScrollingWidthAdjust:Oa,_fnGetWidestNode:Na,
+_fnGetMaxLenString:Pa,_fnStringToCss:q,_fnDetectType:B,_fnSettingsFromNode:s,_fnGetDataMaster:Z,_fnGetTrNodes:T,_fnGetTdNodes:J,_fnEscapeRegex:oa,_fnDeleteIndex:ha,_fnReOrderIndex:u,_fnColumnOrdering:M,_fnLog:D,_fnClearTable:ga,_fnSaveState:ra,_fnLoadState:Sa,_fnCreateCookie:function(a,b,c,d,e){var f=new Date;f.setTime(f.getTime()+1E3*c);var c=X.location.pathname.split("/"),a=a+"_"+c.pop().replace(/[\/:]/g,"").toLowerCase(),g;null!==e?(g="function"===typeof h.parseJSON?h.parseJSON(b):eval("("+b+")"),
+b=e(a,g,f.toGMTString(),c.join("/")+"/")):b=a+"="+encodeURIComponent(b)+"; expires="+f.toGMTString()+"; path="+c.join("/")+"/";a=l.cookie.split(";");e=b.split(";")[0].length;f=[];if(4096<e+l.cookie.length+10){for(var j=0,o=a.length;j<o;j++)if(-1!=a[j].indexOf(d)){var k=a[j].split("=");try{(g=eval("("+decodeURIComponent(k[1])+")"))&&g.iCreate&&f.push({name:k[0],time:g.iCreate})}catch(m){}}for(f.sort(function(a,b){return b.time-a.time});4096<e+l.cookie.length+10;){if(0===f.length)return;d=f.pop();l.cookie=
+d.name+"=; expires=Thu, 01-Jan-1970 00:00:01 GMT; path="+c.join("/")+"/"}}l.cookie=b},_fnReadCookie:function(a){for(var b=X.location.pathname.split("/"),a=a+"_"+b[b.length-1].replace(/[\/:]/g,"").toLowerCase()+"=",b=l.cookie.split(";"),c=0;c<b.length;c++){for(var d=b[c];" "==d.charAt(0);)d=d.substring(1,d.length);if(0===d.indexOf(a))return decodeURIComponent(d.substring(a.length,d.length))}return null},_fnDetectHeader:V,_fnGetUniqueThs:N,_fnScrollBarWidth:Qa,_fnApplyToChildren:C,_fnMap:p,_fnGetRowData:Y,
+_fnGetCellData:v,_fnSetCellData:F,_fnGetObjectDataFn:Q,_fnSetObjectDataFn:L,_fnApplyColumnDefs:ta,_fnBindAction:Ra,_fnExtend:Ta,_fnCallbackReg:z,_fnCallbackFire:A,_fnJsonString:Wa,_fnRender:S,_fnNodeToColumnIndex:fa,_fnInfoMacros:ja,_fnBrowserDetect:Ua,_fnGetColumns:r};h.extend(j.ext.oApi,this.oApi);for(var sa in j.ext.oApi)sa&&(this[sa]=Va(sa));var ca=this;this.each(function(){var a=0,b,c,d;c=this.getAttribute("id");var i=!1,f=!1;if("table"!=this.nodeName.toLowerCase())D(null,0,"Attempted to initialise DataTables on a node which is not a table: "+
+this.nodeName);else{a=0;for(b=j.settings.length;a<b;a++){if(j.settings[a].nTable==this){if(e===n||e.bRetrieve)return j.settings[a].oInstance;if(e.bDestroy){j.settings[a].oInstance.fnDestroy();break}else{D(j.settings[a],0,"Cannot reinitialise DataTable.\n\nTo retrieve the DataTables object for this table, pass no arguments or see the docs for bRetrieve and bDestroy");return}}if(j.settings[a].sTableId==this.id){j.settings.splice(a,1);break}}if(null===c||""===c)this.id=c="DataTables_Table_"+j.ext._oExternConfig.iNextUnique++;
+var g=h.extend(!0,{},j.models.oSettings,{nTable:this,oApi:ca.oApi,oInit:e,sDestroyWidth:h(this).width(),sInstance:c,sTableId:c});j.settings.push(g);g.oInstance=1===ca.length?ca:h(this).dataTable();e||(e={});e.oLanguage&&pa(e.oLanguage);e=Ta(h.extend(!0,{},j.defaults),e);p(g.oFeatures,e,"bPaginate");p(g.oFeatures,e,"bLengthChange");p(g.oFeatures,e,"bFilter");p(g.oFeatures,e,"bSort");p(g.oFeatures,e,"bInfo");p(g.oFeatures,e,"bProcessing");p(g.oFeatures,e,"bAutoWidth");p(g.oFeatures,e,"bSortClasses");
+p(g.oFeatures,e,"bServerSide");p(g.oFeatures,e,"bDeferRender");p(g.oScroll,e,"sScrollX","sX");p(g.oScroll,e,"sScrollXInner","sXInner");p(g.oScroll,e,"sScrollY","sY");p(g.oScroll,e,"bScrollCollapse","bCollapse");p(g.oScroll,e,"bScrollInfinite","bInfinite");p(g.oScroll,e,"iScrollLoadGap","iLoadGap");p(g.oScroll,e,"bScrollAutoCss","bAutoCss");p(g,e,"asStripeClasses");p(g,e,"asStripClasses","asStripeClasses");p(g,e,"fnServerData");p(g,e,"fnFormatNumber");p(g,e,"sServerMethod");p(g,e,"aaSorting");p(g,
+e,"aaSortingFixed");p(g,e,"aLengthMenu");p(g,e,"sPaginationType");p(g,e,"sAjaxSource");p(g,e,"sAjaxDataProp");p(g,e,"iCookieDuration");p(g,e,"sCookiePrefix");p(g,e,"sDom");p(g,e,"bSortCellsTop");p(g,e,"iTabIndex");p(g,e,"oSearch","oPreviousSearch");p(g,e,"aoSearchCols","aoPreSearchCols");p(g,e,"iDisplayLength","_iDisplayLength");p(g,e,"bJQueryUI","bJUI");p(g,e,"fnCookieCallback");p(g,e,"fnStateLoad");p(g,e,"fnStateSave");p(g.oLanguage,e,"fnInfoCallback");z(g,"aoDrawCallback",e.fnDrawCallback,"user");
+z(g,"aoServerParams",e.fnServerParams,"user");z(g,"aoStateSaveParams",e.fnStateSaveParams,"user");z(g,"aoStateLoadParams",e.fnStateLoadParams,"user");z(g,"aoStateLoaded",e.fnStateLoaded,"user");z(g,"aoRowCallback",e.fnRowCallback,"user");z(g,"aoRowCreatedCallback",e.fnCreatedRow,"user");z(g,"aoHeaderCallback",e.fnHeaderCallback,"user");z(g,"aoFooterCallback",e.fnFooterCallback,"user");z(g,"aoInitComplete",e.fnInitComplete,"user");z(g,"aoPreDrawCallback",e.fnPreDrawCallback,"user");g.oFeatures.bServerSide&&
+g.oFeatures.bSort&&g.oFeatures.bSortClasses?z(g,"aoDrawCallback",P,"server_side_sort_classes"):g.oFeatures.bDeferRender&&z(g,"aoDrawCallback",P,"defer_sort_classes");e.bJQueryUI?(h.extend(g.oClasses,j.ext.oJUIClasses),e.sDom===j.defaults.sDom&&"lfrtip"===j.defaults.sDom&&(g.sDom='<"H"lfr>t<"F"ip>')):h.extend(g.oClasses,j.ext.oStdClasses);h(this).addClass(g.oClasses.sTable);if(""!==g.oScroll.sX||""!==g.oScroll.sY)g.oScroll.iBarWidth=Qa();g.iInitDisplayStart===n&&(g.iInitDisplayStart=e.iDisplayStart,
+g._iDisplayStart=e.iDisplayStart);e.bStateSave&&(g.oFeatures.bStateSave=!0,Sa(g,e),z(g,"aoDrawCallback",ra,"state_save"));null!==e.iDeferLoading&&(g.bDeferLoading=!0,a=h.isArray(e.iDeferLoading),g._iRecordsDisplay=a?e.iDeferLoading[0]:e.iDeferLoading,g._iRecordsTotal=a?e.iDeferLoading[1]:e.iDeferLoading);null!==e.aaData&&(f=!0);""!==e.oLanguage.sUrl?(g.oLanguage.sUrl=e.oLanguage.sUrl,h.getJSON(g.oLanguage.sUrl,null,function(a){pa(a);h.extend(true,g.oLanguage,e.oLanguage,a);ba(g)}),i=!0):h.extend(!0,
+g.oLanguage,e.oLanguage);null===e.asStripeClasses&&(g.asStripeClasses=[g.oClasses.sStripeOdd,g.oClasses.sStripeEven]);b=g.asStripeClasses.length;g.asDestroyStripes=[];if(b){c=!1;d=h(this).children("tbody").children("tr:lt("+b+")");for(a=0;a<b;a++)d.hasClass(g.asStripeClasses[a])&&(c=!0,g.asDestroyStripes.push(g.asStripeClasses[a]));c&&d.removeClass(g.asStripeClasses.join(" "))}c=[];a=this.getElementsByTagName("thead");0!==a.length&&(V(g.aoHeader,a[0]),c=N(g));if(null===e.aoColumns){d=[];a=0;for(b=
+c.length;a<b;a++)d.push(null)}else d=e.aoColumns;a=0;for(b=d.length;a<b;a++)e.saved_aoColumns!==n&&e.saved_aoColumns.length==b&&(null===d[a]&&(d[a]={}),d[a].bVisible=e.saved_aoColumns[a].bVisible),o(g,c?c[a]:null);ta(g,e.aoColumnDefs,d,function(a,b){m(g,a,b)});a=0;for(b=g.aaSorting.length;a<b;a++){g.aaSorting[a][0]>=g.aoColumns.length&&(g.aaSorting[a][0]=0);var k=g.aoColumns[g.aaSorting[a][0]];g.aaSorting[a][2]===n&&(g.aaSorting[a][2]=0);e.aaSorting===n&&g.saved_aaSorting===n&&(g.aaSorting[a][1]=
+k.asSorting[0]);c=0;for(d=k.asSorting.length;c<d;c++)if(g.aaSorting[a][1]==k.asSorting[c]){g.aaSorting[a][2]=c;break}}P(g);Ua(g);a=h(this).children("caption").each(function(){this._captionSide=h(this).css("caption-side")});b=h(this).children("thead");0===b.length&&(b=[l.createElement("thead")],this.appendChild(b[0]));g.nTHead=b[0];b=h(this).children("tbody");0===b.length&&(b=[l.createElement("tbody")],this.appendChild(b[0]));g.nTBody=b[0];g.nTBody.setAttribute("role","alert");g.nTBody.setAttribute("aria-live",
+"polite");g.nTBody.setAttribute("aria-relevant","all");b=h(this).children("tfoot");if(0===b.length&&0<a.length&&(""!==g.oScroll.sX||""!==g.oScroll.sY))b=[l.createElement("tfoot")],this.appendChild(b[0]);0<b.length&&(g.nTFoot=b[0],V(g.aoFooter,g.nTFoot));if(f)for(a=0;a<e.aaData.length;a++)H(g,e.aaData[a]);else ua(g);g.aiDisplay=g.aiDisplayMaster.slice();g.bInitialised=!0;!1===i&&ba(g)}});ca=null;return this};j.fnVersionCheck=function(e){for(var h=function(e,h){for(;e.length<h;)e+="0";return e},m=j.ext.sVersion.split("."),
+e=e.split("."),k="",n="",l=0,t=e.length;l<t;l++)k+=h(m[l],3),n+=h(e[l],3);return parseInt(k,10)>=parseInt(n,10)};j.fnIsDataTable=function(e){for(var h=j.settings,m=0;m<h.length;m++)if(h[m].nTable===e||h[m].nScrollHead===e||h[m].nScrollFoot===e)return!0;return!1};j.fnTables=function(e){var o=[];jQuery.each(j.settings,function(j,k){(!e||!0===e&&h(k.nTable).is(":visible"))&&o.push(k.nTable)});return o};j.version="1.9.4";j.settings=[];j.models={};j.models.ext={afnFiltering:[],afnSortData:[],aoFeatures:[],
+aTypes:[],fnVersionCheck:j.fnVersionCheck,iApiIndex:0,ofnSearch:{},oApi:{},oStdClasses:{},oJUIClasses:{},oPagination:{},oSort:{},sVersion:j.version,sErrMode:"alert",_oExternConfig:{iNextUnique:0}};j.models.oSearch={bCaseInsensitive:!0,sSearch:"",bRegex:!1,bSmart:!0};j.models.oRow={nTr:null,_aData:[],_aSortData:[],_anHidden:[],_sRowStripe:""};j.models.oColumn={aDataSort:null,asSorting:null,bSearchable:null,bSortable:null,bUseRendered:null,bVisible:null,_bAutoType:!0,fnCreatedCell:null,fnGetData:null,
+fnRender:null,fnSetData:null,mData:null,mRender:null,nTh:null,nTf:null,sClass:null,sContentPadding:null,sDefaultContent:null,sName:null,sSortDataType:"std",sSortingClass:null,sSortingClassJUI:null,sTitle:null,sType:null,sWidth:null,sWidthOrig:null};j.defaults={aaData:null,aaSorting:[[0,"asc"]],aaSortingFixed:null,aLengthMenu:[10,25,50,100],aoColumns:null,aoColumnDefs:null,aoSearchCols:[],asStripeClasses:null,bAutoWidth:!0,bDeferRender:!1,bDestroy:!1,bFilter:!0,bInfo:!0,bJQueryUI:!1,bLengthChange:!0,
+bPaginate:!0,bProcessing:!1,bRetrieve:!1,bScrollAutoCss:!0,bScrollCollapse:!1,bScrollInfinite:!1,bServerSide:!1,bSort:!0,bSortCellsTop:!1,bSortClasses:!0,bStateSave:!1,fnCookieCallback:null,fnCreatedRow:null,fnDrawCallback:null,fnFooterCallback:null,fnFormatNumber:function(e){if(1E3>e)return e;for(var h=e+"",e=h.split(""),j="",h=h.length,k=0;k<h;k++)0===k%3&&0!==k&&(j=this.oLanguage.sInfoThousands+j),j=e[h-k-1]+j;return j},fnHeaderCallback:null,fnInfoCallback:null,fnInitComplete:null,fnPreDrawCallback:null,
+fnRowCallback:null,fnServerData:function(e,j,m,k){k.jqXHR=h.ajax({url:e,data:j,success:function(e){e.sError&&k.oApi._fnLog(k,0,e.sError);h(k.oInstance).trigger("xhr",[k,e]);m(e)},dataType:"json",cache:!1,type:k.sServerMethod,error:function(e,h){"parsererror"==h&&k.oApi._fnLog(k,0,"DataTables warning: JSON data from server could not be parsed. This is caused by a JSON formatting error.")}})},fnServerParams:null,fnStateLoad:function(e){var e=this.oApi._fnReadCookie(e.sCookiePrefix+e.sInstance),j;try{j=
+"function"===typeof h.parseJSON?h.parseJSON(e):eval("("+e+")")}catch(m){j=null}return j},fnStateLoadParams:null,fnStateLoaded:null,fnStateSave:function(e,h){this.oApi._fnCreateCookie(e.sCookiePrefix+e.sInstance,this.oApi._fnJsonString(h),e.iCookieDuration,e.sCookiePrefix,e.fnCookieCallback)},fnStateSaveParams:null,iCookieDuration:7200,iDeferLoading:null,iDisplayLength:10,iDisplayStart:0,iScrollLoadGap:100,iTabIndex:0,oLanguage:{oAria:{sSortAscending:": activate to sort column ascending",sSortDescending:": activate to sort column descending"},
+oPaginate:{sFirst:"First",sLast:"Last",sNext:"Next",sPrevious:"Previous"},sEmptyTable:"No data available in table",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sInfoThousands:",",sLengthMenu:"Show _MENU_ entries",sLoadingRecords:"Loading...",sProcessing:"Processing...",sSearch:"Search:",sUrl:"",sZeroRecords:"No matching records found"},oSearch:h.extend({},j.models.oSearch),sAjaxDataProp:"aaData",
+sAjaxSource:null,sCookiePrefix:"SpryMedia_DataTables_",sDom:"lfrtip",sPaginationType:"two_button",sScrollX:"",sScrollXInner:"",sScrollY:"",sServerMethod:"GET"};j.defaults.columns={aDataSort:null,asSorting:["asc","desc"],bSearchable:!0,bSortable:!0,bUseRendered:!0,bVisible:!0,fnCreatedCell:null,fnRender:null,iDataSort:-1,mData:null,mRender:null,sCellType:"td",sClass:"",sContentPadding:"",sDefaultContent:null,sName:"",sSortDataType:"std",sTitle:null,sType:null,sWidth:null};j.models.oSettings={oFeatures:{bAutoWidth:null,
+bDeferRender:null,bFilter:null,bInfo:null,bLengthChange:null,bPaginate:null,bProcessing:null,bServerSide:null,bSort:null,bSortClasses:null,bStateSave:null},oScroll:{bAutoCss:null,bCollapse:null,bInfinite:null,iBarWidth:0,iLoadGap:null,sX:null,sXInner:null,sY:null},oLanguage:{fnInfoCallback:null},oBrowser:{bScrollOversize:!1},aanFeatures:[],aoData:[],aiDisplay:[],aiDisplayMaster:[],aoColumns:[],aoHeader:[],aoFooter:[],asDataSearch:[],oPreviousSearch:{},aoPreSearchCols:[],aaSorting:null,aaSortingFixed:null,
+asStripeClasses:null,asDestroyStripes:[],sDestroyWidth:0,aoRowCallback:[],aoHeaderCallback:[],aoFooterCallback:[],aoDrawCallback:[],aoRowCreatedCallback:[],aoPreDrawCallback:[],aoInitComplete:[],aoStateSaveParams:[],aoStateLoadParams:[],aoStateLoaded:[],sTableId:"",nTable:null,nTHead:null,nTFoot:null,nTBody:null,nTableWrapper:null,bDeferLoading:!1,bInitialised:!1,aoOpenRows:[],sDom:null,sPaginationType:"two_button",iCookieDuration:0,sCookiePrefix:"",fnCookieCallback:null,aoStateSave:[],aoStateLoad:[],
+oLoadedState:null,sAjaxSource:null,sAjaxDataProp:null,bAjaxDataGet:!0,jqXHR:null,fnServerData:null,aoServerParams:[],sServerMethod:null,fnFormatNumber:null,aLengthMenu:null,iDraw:0,bDrawing:!1,iDrawError:-1,_iDisplayLength:10,_iDisplayStart:0,_iDisplayEnd:10,_iRecordsTotal:0,_iRecordsDisplay:0,bJUI:null,oClasses:{},bFiltered:!1,bSorted:!1,bSortCellsTop:null,oInit:null,aoDestroyCallback:[],fnRecordsTotal:function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsTotal,10):this.aiDisplayMaster.length},
+fnRecordsDisplay:function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsDisplay,10):this.aiDisplay.length},fnDisplayEnd:function(){return this.oFeatures.bServerSide?!1===this.oFeatures.bPaginate||-1==this._iDisplayLength?this._iDisplayStart+this.aiDisplay.length:Math.min(this._iDisplayStart+this._iDisplayLength,this._iRecordsDisplay):this._iDisplayEnd},oInstance:null,sInstance:null,iTabIndex:0,nScrollHead:null,nScrollFoot:null};j.ext=h.extend(!0,{},j.models.ext);h.extend(j.ext.oStdClasses,
+{sTable:"dataTable",sPagePrevEnabled:"paginate_enabled_previous",sPagePrevDisabled:"paginate_disabled_previous",sPageNextEnabled:"paginate_enabled_next",sPageNextDisabled:"paginate_disabled_next",sPageJUINext:"",sPageJUIPrev:"",sPageButton:"paginate_button",sPageButtonActive:"paginate_active",sPageButtonStaticDisabled:"paginate_button paginate_button_disabled",sPageFirst:"first",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last",sStripeOdd:"odd",sStripeEven:"even",sRowEmpty:"dataTables_empty",
+sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",
+sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:"",sJUIHeader:"",sJUIFooter:""});h.extend(j.ext.oJUIClasses,j.ext.oStdClasses,{sPagePrevEnabled:"fg-button ui-button ui-state-default ui-corner-left",sPagePrevDisabled:"fg-button ui-button ui-state-default ui-corner-left ui-state-disabled",sPageNextEnabled:"fg-button ui-button ui-state-default ui-corner-right",
+sPageNextDisabled:"fg-button ui-button ui-state-default ui-corner-right ui-state-disabled",sPageJUINext:"ui-icon ui-icon-circle-arrow-e",sPageJUIPrev:"ui-icon ui-icon-circle-arrow-w",sPageButton:"fg-button ui-button ui-state-default",sPageButtonActive:"fg-button ui-button ui-state-default ui-state-disabled",sPageButtonStaticDisabled:"fg-button ui-button ui-state-default ui-state-disabled",sPageFirst:"first ui-corner-tl ui-corner-bl",sPageLast:"last ui-corner-tr ui-corner-br",sPaging:"dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi paging_",
+sSortAsc:"ui-state-default",sSortDesc:"ui-state-default",sSortable:"ui-state-default",sSortableAsc:"ui-state-default",sSortableDesc:"ui-state-default",sSortableNone:"ui-state-default",sSortJUIAsc:"css_right ui-icon ui-icon-triangle-1-n",sSortJUIDesc:"css_right ui-icon ui-icon-triangle-1-s",sSortJUI:"css_right ui-icon ui-icon-carat-2-n-s",sSortJUIAscAllowed:"css_right ui-icon ui-icon-carat-1-n",sSortJUIDescAllowed:"css_right ui-icon ui-icon-carat-1-s",sSortJUIWrapper:"DataTables_sort_wrapper",sSortIcon:"DataTables_sort_icon",
+sScrollHead:"dataTables_scrollHead ui-state-default",sScrollFoot:"dataTables_scrollFoot ui-state-default",sFooterTH:"ui-state-default",sJUIHeader:"fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix",sJUIFooter:"fg-toolbar ui-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix"});h.extend(j.ext.oPagination,{two_button:{fnInit:function(e,j,m){var k=e.oLanguage.oPaginate,n=function(h){e.oApi._fnPageChange(e,h.data.action)&&m(e)},k=!e.bJUI?'<a class="'+
+e.oClasses.sPagePrevDisabled+'" tabindex="'+e.iTabIndex+'" role="button">'+k.sPrevious+'</a><a class="'+e.oClasses.sPageNextDisabled+'" tabindex="'+e.iTabIndex+'" role="button">'+k.sNext+"</a>":'<a class="'+e.oClasses.sPagePrevDisabled+'" tabindex="'+e.iTabIndex+'" role="button"><span class="'+e.oClasses.sPageJUIPrev+'"></span></a><a class="'+e.oClasses.sPageNextDisabled+'" tabindex="'+e.iTabIndex+'" role="button"><span class="'+e.oClasses.sPageJUINext+'"></span></a>';h(j).append(k);var l=h("a",j),
+k=l[0],l=l[1];e.oApi._fnBindAction(k,{action:"previous"},n);e.oApi._fnBindAction(l,{action:"next"},n);e.aanFeatures.p||(j.id=e.sTableId+"_paginate",k.id=e.sTableId+"_previous",l.id=e.sTableId+"_next",k.setAttribute("aria-controls",e.sTableId),l.setAttribute("aria-controls",e.sTableId))},fnUpdate:function(e){if(e.aanFeatures.p)for(var h=e.oClasses,j=e.aanFeatures.p,k,l=0,n=j.length;l<n;l++)if(k=j[l].firstChild)k.className=0===e._iDisplayStart?h.sPagePrevDisabled:h.sPagePrevEnabled,k=k.nextSibling,
+k.className=e.fnDisplayEnd()==e.fnRecordsDisplay()?h.sPageNextDisabled:h.sPageNextEnabled}},iFullNumbersShowPages:5,full_numbers:{fnInit:function(e,j,m){var k=e.oLanguage.oPaginate,l=e.oClasses,n=function(h){e.oApi._fnPageChange(e,h.data.action)&&m(e)};h(j).append('<a  tabindex="'+e.iTabIndex+'" class="'+l.sPageButton+" "+l.sPageFirst+'">'+k.sFirst+'</a><a  tabindex="'+e.iTabIndex+'" class="'+l.sPageButton+" "+l.sPagePrevious+'">'+k.sPrevious+'</a><span></span><a tabindex="'+e.iTabIndex+'" class="'+
+l.sPageButton+" "+l.sPageNext+'">'+k.sNext+'</a><a tabindex="'+e.iTabIndex+'" class="'+l.sPageButton+" "+l.sPageLast+'">'+k.sLast+"</a>");var t=h("a",j),k=t[0],l=t[1],r=t[2],t=t[3];e.oApi._fnBindAction(k,{action:"first"},n);e.oApi._fnBindAction(l,{action:"previous"},n);e.oApi._fnBindAction(r,{action:"next"},n);e.oApi._fnBindAction(t,{action:"last"},n);e.aanFeatures.p||(j.id=e.sTableId+"_paginate",k.id=e.sTableId+"_first",l.id=e.sTableId+"_previous",r.id=e.sTableId+"_next",t.id=e.sTableId+"_last")},
+fnUpdate:function(e,o){if(e.aanFeatures.p){var m=j.ext.oPagination.iFullNumbersShowPages,k=Math.floor(m/2),l=Math.ceil(e.fnRecordsDisplay()/e._iDisplayLength),n=Math.ceil(e._iDisplayStart/e._iDisplayLength)+1,t="",r,B=e.oClasses,u,M=e.aanFeatures.p,L=function(h){e.oApi._fnBindAction(this,{page:h+r-1},function(h){e.oApi._fnPageChange(e,h.data.page);o(e);h.preventDefault()})};-1===e._iDisplayLength?n=k=r=1:l<m?(r=1,k=l):n<=k?(r=1,k=m):n>=l-k?(r=l-m+1,k=l):(r=n-Math.ceil(m/2)+1,k=r+m-1);for(m=r;m<=k;m++)t+=
+n!==m?'<a tabindex="'+e.iTabIndex+'" class="'+B.sPageButton+'">'+e.fnFormatNumber(m)+"</a>":'<a tabindex="'+e.iTabIndex+'" class="'+B.sPageButtonActive+'">'+e.fnFormatNumber(m)+"</a>";m=0;for(k=M.length;m<k;m++)u=M[m],u.hasChildNodes()&&(h("span:eq(0)",u).html(t).children("a").each(L),u=u.getElementsByTagName("a"),u=[u[0],u[1],u[u.length-2],u[u.length-1]],h(u).removeClass(B.sPageButton+" "+B.sPageButtonActive+" "+B.sPageButtonStaticDisabled),h([u[0],u[1]]).addClass(1==n?B.sPageButtonStaticDisabled:
+B.sPageButton),h([u[2],u[3]]).addClass(0===l||n===l||-1===e._iDisplayLength?B.sPageButtonStaticDisabled:B.sPageButton))}}}});h.extend(j.ext.oSort,{"string-pre":function(e){"string"!=typeof e&&(e=null!==e&&e.toString?e.toString():"");return e.toLowerCase()},"string-asc":function(e,h){return e<h?-1:e>h?1:0},"string-desc":function(e,h){return e<h?1:e>h?-1:0},"html-pre":function(e){return e.replace(/<.*?>/g,"").toLowerCase()},"html-asc":function(e,h){return e<h?-1:e>h?1:0},"html-desc":function(e,h){return e<
+h?1:e>h?-1:0},"date-pre":function(e){e=Date.parse(e);if(isNaN(e)||""===e)e=Date.parse("01/01/1970 00:00:00");return e},"date-asc":function(e,h){return e-h},"date-desc":function(e,h){return h-e},"numeric-pre":function(e){return"-"==e||""===e?0:1*e},"numeric-asc":function(e,h){return e-h},"numeric-desc":function(e,h){return h-e}});h.extend(j.ext.aTypes,[function(e){if("number"===typeof e)return"numeric";if("string"!==typeof e)return null;var h,j=!1;h=e.charAt(0);if(-1=="0123456789-".indexOf(h))return null;
+for(var k=1;k<e.length;k++){h=e.charAt(k);if(-1=="0123456789.".indexOf(h))return null;if("."==h){if(j)return null;j=!0}}return"numeric"},function(e){var h=Date.parse(e);return null!==h&&!isNaN(h)||"string"===typeof e&&0===e.length?"date":null},function(e){return"string"===typeof e&&-1!=e.indexOf("<")&&-1!=e.indexOf(">")?"html":null}]);h.fn.DataTable=j;h.fn.dataTable=j;h.fn.dataTableSettings=j.settings;h.fn.dataTableExt=j.ext};"function"===typeof define&&define.amd?define(["jquery"],L):jQuery&&!jQuery.fn.dataTable&&
+L(jQuery)})(window,document);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc
new file mode 100644
index 0000000..703d1e3
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc
@@ -0,0 +1,20 @@
+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+<script type="text/javascript">
+//<![CDATA[
+    var MSG_DT_FIRST = _("First");
+    var MSG_DT_LAST = _("Last");
+    var MSG_DT_NEXT = _("Next");
+    var MSG_DT_PREVIOUS = _("Previous");
+    var MSG_DT_EMPTY_TABLE = _("No data available in table");
+    var MSG_DT_INFO = _("Showing _START_ to _END_ of _TOTAL_");
+    var MSG_DT_INFO_EMPTY = _("No entries to show");
+    var MSG_DT_INFO_FILTERED = _("(filtered from _MAX_ total entries)");
+    var MSG_DT_LENGTH_MENU = _("Show _MENU_ entries");
+    var MSG_DT_LOADING_RECORDS = _("Loading...");
+    var MSG_DT_PROCESSING = _("Processing...");
+    var MSG_DT_SEARCH = _("Search:");
+    var MSG_DT_ZERO_RECORDS = _("No matching records found");
+    var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the");
+//]]>
+</script>
+<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
index 34aa8e9..2ee9d0b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
@@ -2,9 +2,7 @@
 <title>Koha &rsaquo; Acquisitions</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index 3627077..f884b2a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -9,9 +9,7 @@
 </title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 <script type="text/JavaScript">
 //<![CDATA[
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index 84df886..6f450c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -3,10 +3,7 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
-
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
     function updateColumnsVisibility(visible) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
index 6bb0048..d4027a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -3,8 +3,7 @@
 <title>Koha &rsaquo; Basket grouping for [% booksellername |html %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script>
 <script type="text/javascript" src="[% yuipath %]/button/button-min.js"></script>
 <script type="text/javascript" src="[% yuipath %]/container/container_core-min.js"></script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
index 525ea66..dff9957 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
@@ -8,9 +8,7 @@
 }
 </style>
 <link rel="stylesheet" href="[% themelang %]/css/datatables.css" />
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
index 4132edb..c539fe0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
@@ -4,9 +4,7 @@
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
 [% IF (dateformat == 'metric') %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
index 1ce4cd8..008e241 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
@@ -5,9 +5,7 @@
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
     $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
index 16c1b61..584d787 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -4,9 +4,7 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; Invoices</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 [% INCLUDE 'calendar.inc' %]
 <script type="text/javascript">
 //<![CDATA[
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index c825d06..83dcbe5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -3,12 +3,9 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; Late orders</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 [% INCLUDE 'calendar.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 [% IF (dateformat == 'metric') %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
index f2d9925..c466cd1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
@@ -3,9 +3,7 @@
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'greybox.inc' %]
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
  $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
index ea9bc32..a7f7019 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
@@ -3,9 +3,7 @@
 <title>Koha &rsaquo; Serials [% biblionumber %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
     function updateRowsVisibility(show_only_renewed) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
index 54e9c7a..2b30eba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt
@@ -2,9 +2,7 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; Add order from a suggestion</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
  $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
index 23441f8..05a3321 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -3,9 +3,7 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; Ordered</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
 [% IF (dateformat == 'metric') %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index 10382cb..90dcf8b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -3,9 +3,7 @@
             Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% formatteddatereceived %][% ELSE %]Receive orders from [% name %][% END %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 [% INCLUDE 'greybox.inc' %]
 <script type="text/javascript" src="[% yuipath %]/json/json-min.js"></script>
 <script type="text/javascript">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
index 26e4af8..122bbb7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -4,9 +4,7 @@
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
  $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
index 95634d0..4dae398 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -3,9 +3,7 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; Spent</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
  $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
index 16b2fd1..0dba956 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -3,9 +3,7 @@
 <title>Koha &rsaquo; Vendor [% bookselname %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 
 <script type="text/javascript">
 //<![CDATA[
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
index a7b5fc9..41aad00 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -2,9 +2,7 @@
 <title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername %][% ELSE %]Orders with uncertain prices[% END %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
 //<![CDATA[
  $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index 7ce0222..2983dc3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -3,9 +3,7 @@
 [% INCLUDE 'greybox.inc' %]
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+[% INCLUDE 'datatables.inc' %]
 
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type="text/javascript">
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Mon Jul 29 05:59:17 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon, 29 Jul 2013 15:59:17 +1200
Subject: [Koha-patches] [PATCH] Bug 10644: ClassSource.pm needs unit tests
Message-ID: <1375070420-4565-1-git-send-email-srdjan@catalyst.net.nz>

From: root <root at kenza-VirtualBox>

The tests are wrap in a database transaction.

To test:
prove t/db_dependent/ClassSource.t
t/db_dependent/ClassSource.t .. 1/24 prepare_cached(SELECT * FROM `class_sort_rules` WHERE `class_sort_rule` = ?) statement handle DBI::st=HASH(0x92dbedc) still Active at C4/ClassSource.pm line 249
prepare_cached(SELECT * FROM `class_sources` WHERE cn_source = ?) statement handle DBI::st=HASH(0x926876c) still Active at C4/ClassSource.pm line 137
attempting to use non-existent class sorting routine routine1
prepare_cached(SELECT * FROM `class_sort_rules` WHERE `class_sort_rule` = ?) statement handle DBI::st=HASH(0x92dbedc) still Active at C4/ClassSource.pm line 249
prepare_cached(SELECT * FROM `class_sources` WHERE cn_source = ?) statement handle DBI::st=HASH(0x926876c) still Active at C4/ClassSource.pm line 137
t/db_dependent/ClassSource.t .. ok
All tests successful.
Files=1, Tests=24,  0 wallclock secs ( 0.02 usr  0.00 sys +  0.12 cusr  0.01 csys =  0.15 CPU)
Result: PASS

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 t/db_dependent/ClassSource.t | 198 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 198 insertions(+)
 create mode 100644 t/db_dependent/ClassSource.t

diff --git a/t/db_dependent/ClassSource.t b/t/db_dependent/ClassSource.t
new file mode 100644
index 0000000..0b1b2e2
--- /dev/null
+++ b/t/db_dependent/ClassSource.t
@@ -0,0 +1,198 @@
+#!/usr/bin/perl
+
+use Modern::Perl;
+
+use Test::More tests => 24;
+
+use C4::Context;
+
+BEGIN {
+    use_ok('C4::ClassSource');
+}
+can_ok( 'C4::ClassSource',
+    qw( AddClassSortRule
+        AddClassSource
+        GetClassSort
+        GetClassSortRule
+        GetClassSortRules
+        GetClassSource
+        GetClassSources
+        DelClassSortRule
+        DelClassSource
+        GetSourcesForSortRule
+        ModClassSortRule
+        ModClassSource)
+);
+
+#Start transaction
+my $dbh = C4::Context->dbh;
+$dbh->{RaiseError} = 1;
+$dbh->{AutoCommit} = 0;
+
+#Start tests
+$dbh->do(q|DELETE FROM class_sources|);
+$dbh->do(q|DELETE FROM class_sort_rules|);
+
+#Test AddClassSortRule
+my $countSources  = scalar( keys(GetClassSources) );
+my $countSources2 = scalar( keys(GetClassSortRules) );
+AddClassSortRule( 'sortrule1', 'description1', 'routine1' );
+AddClassSortRule( 'sortrule2', 'description2', 'routine2' );
+is(
+    scalar( keys(GetClassSortRules) ),
+    $countSources + 2,
+    "SortRule1 and SortRules2 have been added"
+);
+
+#Test AddClassSource
+AddClassSource( 'source1', 'Description_source1', 1, 'sortrule1' );
+AddClassSource( 'source2', 'Description_source2', 0, 'sortrule1' );
+is(
+    scalar( keys(GetClassSources) ),
+    $countSources2 + 2,
+    "Source1 and source2 have been added"
+);
+
+#Test GetClassSortRule
+is_deeply(
+    GetClassSortRule('sortrule1'),
+    {
+        class_sort_rule => 'sortrule1',
+        description     => 'description1',
+        sort_routine    => 'routine1'
+    },
+    "GetClassSort gives sortrule1's informations"
+);
+is_deeply( GetClassSortRule(), undef,
+    "GetClassSort without params returns undef" );
+is_deeply( GetClassSortRule('doesnt_exist'),
+    undef, "GetClassSort with an id which doesn't exist returns undef" );
+
+#Test GetClassSortRules
+my $getsortrules = GetClassSortRules();
+is_deeply(
+    $getsortrules,
+    {
+        sortrule1 => {
+            class_sort_rule => 'sortrule1',
+            description     => 'description1',
+            sort_routine    => 'routine1'
+        },
+        sortrule2 => {
+            class_sort_rule => 'sortrule2',
+            description     => 'description2',
+            sort_routine    => 'routine2'
+        }
+    },
+    "GetClassSortRules returns the id off all SortRule and there informations"
+);
+
+#Test GetClassSource
+my $getsource1 = GetClassSource('source1');
+is_deeply(
+    $getsource1,
+    {
+        cn_source       => 'source1',
+        description     => 'Description_source1',
+        used            => 1,
+        class_sort_rule => 'sortrule1'
+    },
+    "GetClassSource gives source1's informations"
+);
+is_deeply( GetClassSource(), undef,
+    "GetClassSource without params returns undef" );
+is_deeply( GetClassSource('doesnt_exist'),
+    undef, "GetClassSource with an id which doesn't exist returns undef" );
+
+#Test GetClassSources
+my $getsources = GetClassSources();
+is_deeply(
+    $getsources,
+    {
+        source1 => {
+            cn_source       => 'source1',
+            description     => 'Description_source1',
+            used            => 1,
+            class_sort_rule => 'sortrule1'
+        },
+        source2 => {
+            cn_source       => 'source2',
+            description     => 'Description_source2',
+            used            => 0,
+            class_sort_rule => 'sortrule1'
+        }
+    },
+    "GetClassSources returns the id off all sources and there informations"
+);
+
+#Test GetClassSort
+my $getclassSort = GetClassSort( 'source1', 'sortrule1', 'item1' )
+  ; #Note: Create a warning:" attempting to use non-existent class sorting routine $sort_routine"
+is( $getclassSort, "SORTRULE1_ITEM1",
+" the sort key corresponding to Source1 and sortrule1 and item1 is SORTRULE1_ITEM1"
+);
+
+#Test GetSourcesForSorSortRule
+my @sources = GetSourcesForSortRule('sortrule1');
+is_deeply(
+    \@sources,
+    [ 'source1', 'source2' ],
+    "Sortrule1 has source1 and source2"
+);
+ at sources = GetSourcesForSortRule();
+is_deeply( \@sources, [],
+    "Without params GetSourcesForSortRule returns an empty array" );
+ at sources = GetSourcesForSortRule('doesnt_exist');
+is_deeply( \@sources, [],
+    "With a wrong params GetSourcesForSortRule returns an empty array" );
+
+#Test DelClassSortRule
+#DelClassSortRule ('sortrule1');
+#is(scalar (keys (GetClassSortRules)),1,"SortRule1 has been deleted");#FIXME : impossible if some sources exist
+DelClassSortRule('sortrule2');
+is( scalar( keys(GetClassSortRules) ), 1, "SortRule2 has been deleted" );
+DelClassSortRule();
+is( scalar( keys(GetClassSortRules) ),
+    1, "Without params DelClassSortRule doesn't do anything" );
+DelClassSortRule('doesnt_exist');
+is( scalar( keys(GetClassSortRules) ),
+    1, "Without wrong id, DelClassSortRule doesn't do anything" );
+
+#Test DelClassSource
+DelClassSource('source2');
+is( scalar( keys(GetClassSources) ), 1, "Source2 has been deleted" );
+DelClassSource();
+is( scalar( keys(GetClassSources) ),
+    1, "Without params DelClassSource doesn't do anything" );
+DelClassSource('doesnt_exist');
+is( scalar( keys(GetClassSources) ),
+    1, "Without wrong id, DelClassSource doesn't do anything" );
+
+#Test ModClassSortRule
+ModClassSortRule( 'sortrule1', 'description1_modified', 'routine1_modified' );
+is_deeply(
+    GetClassSortRule('sortrule1'),
+    {
+        class_sort_rule => 'sortrule1',
+        description     => 'description1_modified',
+        sort_routine    => 'routine1_modified'
+    },
+    "Sortrule1 has been modified"
+);
+
+#Test ModClassSource
+ModClassSource( 'source1', 'Description_source1_modified', 0, 'sortrule1' );
+is_deeply(
+    GetClassSource('source1'),
+    {
+        cn_source       => 'source1',
+        description     => 'Description_source1_modified',
+        used            => 0,
+        class_sort_rule => 'sortrule1'
+    },
+    "Source1 has been modified"
+);
+
+#End transaction
+$dbh->rollback;
+
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Tue Jul 30 05:54:36 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Tue, 30 Jul 2013 15:54:36 +1200
Subject: [Koha-patches] [PATCH] Bug 10638 - Show alert when receiving an
	order with holds/reserves
Message-ID: <1375156476-27179-1-git-send-email-srdjan@catalyst.net.nz>

From: David Cook <dcook at prosentient.com.au>

This patch adds an alert message in Acquisitions when receiving new
orders.

If there are bib-level holds for the bib record attached to that order,
it gives a count of the bib-level holds.

If there are item-level holds for items attached to that order, it
shows a count of the items as well as displaying the barcodes for the
items that have holds/reserves on them.

If there are item-level holds for items not attached to that order and
there are no bib-level holds, the message will just say that there are
pending reserves for that bib record.

TEST PLAN

1) Set AcqCreateItem to "placing an order"
2) Place an order in Acquisitions
3) Create three or four items when placing that order
4) In the OPAC or staff client, place a hold on one item
5) Receive the order
6) Note that there is no alert message about the hold/reserve

7) Apply the patch

8) Receive another item for that order
9) Note that there should now be a yellow alert message at the top of
the parcel.pl screen.

10) The message text will vary depending on the reserve/hold situation.

If there are bib-level holds, it will display a count of bib-level holds.

If there are item-level holds for items attached to that order, it will
show a count of those holds and print out their barcodes. (N.B. if you
are receiving part of an order, your order number will change, so it
will only print information for the received items that are attached
to this new order, rather than all items including the original order.)

If there are item-level holds for items attached to a different order
or no order at all, no specific information will be printed. It will
just say that there are pending reserves for that record (or that
there are bib-level holds, if there are bib-level holds).

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 acqui/finishreceive.pl                             |  6 ++-
 acqui/parcel.pl                                    | 45 ++++++++++++++++++++++
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  | 14 +++++++
 3 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index f9c8532..80df8b6 100755
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -41,6 +41,7 @@ checkauth($input, 0, $flagsrequired, 'intranet');
 my $user             = $input->remote_user;
 my $biblionumber     = $input->param('biblionumber');
 my $ordernumber      = $input->param('ordernumber');
+my $resordernumber   = $ordernumber;
 my $origquantityrec  = $input->param('origquantityrec');
 my $quantityrec      = $input->param('quantityrec');
 my $quantity         = $input->param('quantity');
@@ -136,11 +137,14 @@ if ($quantityrec > $origquantityrec ) {
         }
     }
 
+    if ($new_ordernumber) {
+        $resordernumber = $new_ordernumber;
+    }
 }
 
 update_item( $_ ) foreach GetItemnumbersFromOrder( $ordernumber );
 
-print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid");
+print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid&resbiblionumber=$biblionumber&resordernumber=$resordernumber");
 
 ################################ End of script ################################
 
diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index ee96e3f..85d8a75 100755
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -69,6 +69,8 @@ use C4::Dates qw/format_date format_date_in_iso/;
 use C4::Suggestions;
 use JSON;
 
+use C4::Reserves;
+
 my $input=new CGI;
 
 sub get_value_with_gst_params {
@@ -130,6 +132,49 @@ unless( $invoiceid and $invoice->{invoiceid} ) {
     exit;
 }
 
+my $received_biblionumber = $input->param('resbiblionumber');
+my $received_ordernumber = $input->param('resordernumber');
+if ($received_biblionumber && $received_ordernumber) {
+    my ($reserve_count, $title_reserves) = GetReservesFromBiblionumber($received_biblionumber);
+    if ($reserve_count > 0) {
+
+        my $bib_level_hold = 0;
+        my @matches;
+
+        my $received_biblio_data = GetBiblioData($received_biblionumber);
+        my @received_items = GetItemnumbersFromOrder($received_ordernumber);
+
+        foreach my $reserved_title (@$title_reserves) {
+            my $reserve_itemnumber = $reserved_title->{itemnumber};
+            if (defined $reserve_itemnumber) {
+                push(@matches, grep( $_ == $reserve_itemnumber, @received_items ));
+            }
+            else {
+                $bib_level_hold++;
+            }
+        }
+
+        if ($bib_level_hold > 0) {
+            $template->param('bib_level_holds'  => $bib_level_hold);
+        }
+        if (@matches) {
+            my @reserve_barcodes;
+            foreach my $itemnumber_match (@matches) {
+                my $result_barcode = GetBarcodeFromItemnumber($itemnumber_match);
+                push(@reserve_barcodes,$result_barcode);
+            }
+            if(@reserve_barcodes){
+                $template->param('item_level_holds' =>  \@reserve_barcodes);
+            }
+        }
+
+        $template->param(
+            bib_has_reserves => 1,
+            bib_title => $received_biblio_data->{title},
+        );
+    }
+}
+
 my $op = $input->param('op') // '';
 
 if ($op eq 'cancelreceipt') {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index 10382cb..0150ca7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -166,6 +166,20 @@
         </div>
     [% END %]
 
+    [% IF bib_has_reserves %]
+        <div class="dialog alert">
+            The record [% IF ( bib_title ) %] for "[% bib_title %]"[% END %] has
+            [% IF ( bib_level_holds ) %][% bib_level_holds %] bib-level [% END %]
+            [% IF ( item_level_holds ) %][% IF ( bib_level_holds ) %] and [% END %][% item_level_holds.size %] item-level [% END %]pending reserves.
+            <br /><br />
+            [% IF ( item_level_holds ) %]The item-level reserves are for the following barcodes:
+                <ul>
+                [% FOREACH item_hold IN item_level_holds %]<li>[% item_hold %]</li>[% END %]
+                </ul>
+            [% END %]
+        </div>
+    [% END %]
+
 [% UNLESS no_orders_to_display %]
 <div id="acqui_receive_summary">
 <p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Tue Jul 30 06:18:59 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Tue, 30 Jul 2013 16:18:59 +1200
Subject: [Koha-patches] [PATCH] Bug 10641 - GetBooksellerWithLateOrders in
	C4::Bookseller.pm has some incoherences
Message-ID: <1375157991-30117-1-git-send-email-srdjan@catalyst.net.nz>

From: root <root at kenza-VirtualBox>

This patch fixes some incoherences of the routine GetBooksellerWithOrders.
Now it considers the field $estimateddeliverydateto and it replaces it by now() only if it is undef.
More it doesn't test if $aqbookseller.deliverytime is not Null anymore but if $deliverytime = null or undef, it replaces it by 0.
It also verifies if $delay is >= 0 and return undef if it is a negative value.

To Test:
prove t/db_dependent/Bookseller.t
t/db_dependent/Bookseller.t ..
[Some warnings about uninitialized values]
WARNING: GetBooksellerWithLateOrders is called with a negative value at C4/Bookseller.pm line 135.
t/db_dependent/Bookseller.t .. ok
All tests successful.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Bookseller.pm            | 32 ++++++++++++++++-----------
 t/db_dependent/Bookseller.t | 53 +++++++++++++++++++--------------------------
 2 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm
index 3e1454f..3bd0b28 100644
--- a/C4/Bookseller.pm
+++ b/C4/Bookseller.pm
@@ -111,10 +111,10 @@ sub GetBooksellersWithLateOrders {
     # FIXME NOT quite sure that this operation is valid for DBMs different from Mysql, HOPING so
     # should be tested with other DBMs
 
-    my $strsth;
+    my $query;
     my @query_params = ();
     my $dbdriver = C4::Context->config("db_scheme") || "mysql";
-    $strsth = "
+    $query = "
         SELECT DISTINCT aqbasket.booksellerid, aqbooksellers.name
         FROM aqorders LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
         LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id
@@ -128,24 +128,30 @@ sub GetBooksellersWithLateOrders {
             AND aqorders.quantity - COALESCE(aqorders.quantityreceived,0) <> 0
             AND aqbasket.closedate IS NOT NULL
     ";
-    if ( defined $delay ) {
-        $strsth .= " AND (closedate <= DATE_SUB(CAST(now() AS date),INTERVAL ? DAY)) ";
+    if ( defined $delay && $delay >= 0 ) {
+        $query .= " AND (closedate <= DATE_SUB(CAST(now() AS date),INTERVAL ? + COALESCE(aqbooksellers.deliverytime,0) DAY)) ";
         push @query_params, $delay;
+    } elsif ( $delay < 0 ){
+        warn 'WARNING: GetBooksellerWithLateOrders is called with a negative value';
+        return;
     }
     if ( defined $estimateddeliverydatefrom ) {
-        $strsth .= '
-            AND aqbooksellers.deliverytime IS NOT NULL
-            AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) >= ?';
-        push @query_params, $estimateddeliverydatefrom;
+        $query .= '
+            AND ADDDATE(aqbasket.closedate, INTERVAL COALESCE(aqbooksellers.deliverytime,0) DAY) >= ?';
+            push @query_params, $estimateddeliverydatefrom;
+            if ( defined $estimateddeliverydateto ) {
+                $query .= ' AND ADDDATE(aqbasket.closedate, INTERVAL COALESCE(aqbooksellers.deliverytime, 0) DAY) <= ?';
+                push @query_params, $estimateddeliverydateto;
+            } else {
+                    $query .= ' AND ADDDATE(aqbasket.closedate, INTERVAL COALESCE(aqbooksellers.deliverytime, 0) DAY) <= CAST(now() AS date)';
+            }
     }
-    if ( defined $estimateddeliverydatefrom and defined $estimateddeliverydateto ) {
-        $strsth .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) <= ?';
+    if ( defined $estimateddeliverydateto ) {
+        $query .= ' AND ADDDATE(aqbasket.closedate, INTERVAL COALESCE(aqbooksellers.deliverytime,0) DAY) <= ?';
         push @query_params, $estimateddeliverydateto;
-    } elsif ( defined $estimateddeliverydatefrom ) {
-        $strsth .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) <= CAST(now() AS date)';
     }
 
-    my $sth = $dbh->prepare($strsth);
+    my $sth = $dbh->prepare($query);
     $sth->execute( @query_params );
     my %supplierlist;
     while ( my ( $id, $name ) = $sth->fetchrow ) {
diff --git a/t/db_dependent/Bookseller.t b/t/db_dependent/Bookseller.t
index 71307f1..0ad91ce 100644
--- a/t/db_dependent/Bookseller.t
+++ b/t/db_dependent/Bookseller.t
@@ -2,7 +2,7 @@
 
 use Modern::Perl;
 
-use Test::More tests => 53;
+use Test::More tests => 61;
 use C4::Context;
 use Koha::DateUtils;
 use DateTime::Duration;
@@ -476,17 +476,15 @@ isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" )
 %suppliers = C4::Bookseller::GetBooksellersWithLateOrders( 4, undef, undef );
 isnt( exists( $suppliers{$id_supplier1} ),
     1, "Supplier1 has late orders but  today  > now() - 4 days" );
-#FIXME: If only the field delay is given, it doen't consider the deliverytime
-#isnt( exists( $suppliers{$id_supplier2} ),
-#    1, "Supplier2 has late orders and $daysago5 <= now() - (4 days+2)" );
+isnt( exists( $suppliers{$id_supplier2} ),
+    1, "Supplier2 has late orders and $daysago5 <= now() - (4 days+2)" );
 ok( exists( $suppliers{$id_supplier3} ),
     "Supplier3 has late orders and $daysago10  <= now() - (4 days+3)" );
 isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
 
 #Case 3: With $delay = -1
-#FIXME: GetBooksellersWithLateOrders doesn't test if the delay is a positive value
-#is( C4::Bookseller::GetBooksellersWithLateOrders( -1, undef, undef ),
-#    undef, "-1 is a wrong value for a delay" );
+is( C4::Bookseller::GetBooksellersWithLateOrders( -1, undef, undef ),
+    undef, "-1 is a wrong value for a delay" );
 
 #Case 4: With $delay = 0
 #    today  == now-0 -LATE- (if no deliverytime or deliverytime == 0)
@@ -516,9 +514,8 @@ my $daysago4 = output_pref( $dt_today3, 'iso', '24hr', 1 );
 %suppliers =
   C4::Bookseller::GetBooksellersWithLateOrders( undef, $daysago4, undef );
 
-#FIXME: if the deliverytime is undef, it doesn't consider the supplier
-#ok( exists( $suppliers{$id_supplier1} ),
-#    "Supplier1 has late orders and $today >= $daysago4 -deliverytime undef" );
+ok( exists( $suppliers{$id_supplier1} ),
+    "Supplier1 has late orders and $today >= $daysago4 -deliverytime undef" );
 ok( exists( $suppliers{$id_supplier2} ),
     "Supplier2 has late orders and $daysago5 + 2 days >= $daysago4 " );
 isnt( exists( $suppliers{$id_supplier3} ),
@@ -552,13 +549,11 @@ isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
 #    quantityreceived = quantity -NOT LATE-
 %suppliers =
   C4::Bookseller::GetBooksellersWithLateOrders( undef, undef, $daysago5 );
-#FIXME: if only the estimateddeliverydatefrom is given, it doesn't consider the parameters,
-#but it replaces it today's date
-#isnt( exists( $suppliers{$id_supplier1} ),
-#    1,
-#    "Supplier1 has late orders but $today >= $daysago5 - deliverytime undef" );
-#isnt( exists( $suppliers{$id_supplier2} ),
-#    1, "Supplier2 has late orders but  $daysago5 + 2 days  > $daysago5 " );
+isnt( exists( $suppliers{$id_supplier1} ),
+    1,
+    "Supplier1 has late orders but $today >= $daysago5 - deliverytime undef" );
+isnt( exists( $suppliers{$id_supplier2} ),
+    1, "Supplier2 has late orders but  $daysago5 + 2 days  > $daysago5 " );
 ok( exists( $suppliers{$id_supplier3} ),
     "Supplier3 has late orders and $daysago10 + 3  <= $daysago5" );
 isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
@@ -616,13 +611,11 @@ isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
   C4::Bookseller::GetBooksellersWithLateOrders( 5, undef, $daysago5 );
 isnt( exists( $suppliers{$id_supplier1} ),
     1, "Supplier2 has late orders but today > $daysago5 today > now() -5" );
-#FIXME: GetBookSellersWithLateOrders replace estimateddeliverydateto by
-#today's date when no estimateddeliverydatefrom is give
-#isnt(
-#    exists( $suppliers{$id_supplier2} ),
-#    1,
-#"Supplier2 has late orders but $daysago5 + 2 days > $daysago5  and $daysago5 > now() - 2+5 days"
-#);
+isnt(
+    exists( $suppliers{$id_supplier2} ),
+    1,
+"Supplier2 has late orders but $daysago5 + 2 days > $daysago5  and $daysago5 > now() - 2+5 days"
+);
 ok(
     exists( $suppliers{$id_supplier3} ),
 "Supplier2 has late orders and $daysago10 + 3 days <= $daysago5 and $daysago10 <= now() - 3+5 days "
@@ -643,10 +636,9 @@ $basket1info = {
 ModBasket($basket1info);
 %suppliers = C4::Bookseller::GetBooksellersWithLateOrders( undef, $daysago10,
     $daysago10 );
-#FIXME :GetBookSellers doesn't take care if the closedate is ==$estimateddeliverydateto
-# ok( exists( $suppliers{$id_supplier1} ),
-#    "Supplier1 has late orders and $daysago10==$daysago10==$daysago10 " )
-#  ;
+ok( exists( $suppliers{$id_supplier1} ),
+    "Supplier1 has late orders and $daysago10==$daysago10==$daysago10 " )
+  ;
 isnt( exists( $suppliers{$id_supplier2} ),
     1,
     "Supplier2 has late orders but $daysago10==$daysago10<$daysago5+2" );
@@ -658,9 +650,8 @@ isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
 #Case 12: closedate == $estimateddeliverydatefrom =today-10
 %suppliers =
   C4::Bookseller::GetBooksellersWithLateOrders( undef, $daysago10, undef );
-#FIXME :GetBookSellers doesn't take care if the closedate is ==$estimateddeliverydateto
-#ok( exists( $suppliers{$id_supplier1} ),
-#    "Supplier1 has late orders and $daysago10==$daysago10 " );
+ok( exists( $suppliers{$id_supplier1} ),
+    "Supplier1 has late orders and $daysago10==$daysago10 " );
 
 #Case 13: closedate == $estimateddeliverydateto =today-10
 %suppliers =
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Wed Jul 31 04:25:05 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 31 Jul 2013 14:25:05 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] ModBookseller needs more
	explicit return values in C4::Bookseller.pm
Message-ID: <1375237541-26066-1-git-send-email-srdjan@catalyst.net.nz>

From: root <root at kenza-VirtualBox>

Before, ModBookseller always returns undef. This patch modifies it in order to be more explicit.
Now it returns :
1 -> If a modification has been done
0E0 -> If the given id doesn't exist
undef -> If no id given

It also fix one of the tests which didn't pass before in t/db_dependent/Bookseller.t

To Test:
prove t/db_dependent/Bookseller.t
Bookseller.t .. 1/54
[Some warnings about uninitialized values]
t/db_dependent/Bookseller.t .. ok
All tests successful.
Files=1, Tests=54,  1 wallclock secs ( 0.03 usr  0.00 sys +  0.46 cusr  0.04 csys =  0.53 CPU)
Result: PASS

http://bugs.koha-community.org/show_bug.cgi?id=10640

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Bookseller.pm            | 4 ++--
 t/db_dependent/Bookseller.t | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm
index 3e1454f..97500f0 100644
--- a/C4/Bookseller.pm
+++ b/C4/Bookseller.pm
@@ -226,6 +226,7 @@ C<&ModBookseller> with the result.
 sub ModBookseller {
     my ($data) = @_;
     my $dbh    = C4::Context->dbh;
+    return unless $data->{'id'};
     my $query  = 'UPDATE aqbooksellers
         SET name=?,address1=?,address2=?,address3=?,address4=?,
             postal=?,phone=?,accountnumber=?,fax=?,url=?,contact=?,contpos=?,
@@ -235,7 +236,7 @@ sub ModBookseller {
             discount=?,notes=?,gstrate=?,deliverytime=?
         WHERE id=?';
     my $sth = $dbh->prepare($query);
-    $sth->execute(
+    return $sth->execute(
         $data->{'name'},         $data->{'address1'},
         $data->{'address2'},     $data->{'address3'},
         $data->{'address4'},     $data->{'postal'},
@@ -253,7 +254,6 @@ sub ModBookseller {
         $data->{deliverytime},
         $data->{'id'}
     );
-    return;
 }
 
 =head2 DelBookseller
diff --git a/t/db_dependent/Bookseller.t b/t/db_dependent/Bookseller.t
index 71307f1..df83fa0 100644
--- a/t/db_dependent/Bookseller.t
+++ b/t/db_dependent/Bookseller.t
@@ -2,7 +2,7 @@
 
 use Modern::Perl;
 
-use Test::More tests => 53;
+use Test::More tests => 54;
 use C4::Context;
 use Koha::DateUtils;
 use DateTime::Duration;
@@ -248,13 +248,11 @@ $sample_supplier2 = {
     deliverytime  => 2,
 };
 
-#FIXME : ModBookseller always returns undef, even if the id isn't given
-#or doesn't exist
 my $modif1 = C4::Bookseller::ModBookseller();
 is( $modif1, undef,
     "ModBookseller returns undef if no params given - Nothing happened" );
 $modif1 = C4::Bookseller::ModBookseller($sample_supplier2);
-#is( $modif1, 1, "ModBookseller modifies only the supplier2" );
+is( $modif1, 1, "ModBookseller modifies only the supplier2" );
 is( scalar( C4::Bookseller::GetBookSeller('') ),
     $count + 2, "Supplier2 has been modified - Nothing added" );
 
-- 
1.8.1.2

From oleonard at myacpl.org  Wed Jul 31 21:47:17 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 31 Jul 2013 15:47:17 -0400
Subject: [Koha-patches] [PATCH] Bug 10668 - Improve suggestion detail page
Message-ID: <1375300038-11064-1-git-send-email-oleonard@myacpl.org>

This patch makes several improvements to the suggestions template:

- Improved breadcrumbs and page title.
- Fixed a JavaScript error which appeared when viewing or editing a
  suggestion.
- Added an 'Edit' and a 'Delete' button to the suggestion detail page.
- Corrected capitalization.

To test:
- Perform various operations with suggestions management and
  confirm that page titles and breadcrumbs are correct.
- View the detail page for an individual suggestion and confirm that
  the edit and delete buttons work correctly.
- Confirm that there are no JavaScript errors when viewing or editing a
  suggestion, in particular when changing Acquisition information
  (quantity, currency, price).
---
 koha-tmpl/intranet-tmpl/prog/en/js/acq.js          |   11 ++--
 .../prog/en/modules/suggestion/suggestion.tt       |   64 ++++++++++++++------
 2 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
index 9997768..3fde6f1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
@@ -660,13 +660,12 @@ function updateCosts(){
 
 function calcNewsuggTotal(){
     //collect values
-    var quantity = new Number(document.getElementById('quantity').value);
-//    var currency = f.currency.value;
-    var currcode = new String(document.getElementById('currency').value);
-    var price   =  new Number(document.getElementById('price').value);
-    var exchangerate =  new Number(document.getElementById('currency_rate_'+currcode).value);
+    var quantity = Number(document.getElementById('quantity').value);
+    var currcode = String(document.getElementById('currency').value);
+    var price   =  Number(document.getElementById('price').value);
+    var exchangerate =  Number(document.getElementById('currency_rate_'+currcode).value);
 
-    var total =  new Number(quantity*price*exchangerate);
+    var total =  Number(quantity*price*exchangerate);
 
     document.getElementById('total').value = total.toFixed(2);
     document.getElementById('price').value =  price.toFixed(2);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index 0b4a4ab..9fd2e67 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -3,21 +3,35 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions  &rsaquo;
     [% IF ( op_save ) %]
-        [% IF ( suggestionid) %]
-            [% IF ( op == 'show' ) %]
-                Show purchase suggestion #[% suggestionid %]
-            [% ELSE %]
-                Edit purchase suggestion #[% suggestionid %]
-            [% END %]
+        [% IF ( suggestionid ) %]
+            Suggestions &rsaquo;  Edit suggestion #[% suggestionid %]
         [% ELSE %]
-            Enter a new purchase suggestion
+            Suggestions &rsaquo; Add suggestion
         [% END %]
+    [% ELSIF ( op == 'show' ) %]
+           Suggestions &rsaquo; Show suggestion #[% suggestionid %]
     [% ELSE %]
         Suggestions management
     [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
+[% IF ( op == 'show' ) %]
+<script type="text/javascript">
+    // <![CDATA[
+    $(document).ready(function(){
+        $("#deletesuggestion").on("click",function(){
+            var is_confirmed = confirm(_("Are you sure you want to delete this suggestion?"));
+            if (is_confirmed) {
+                return true;
+            } else {
+                return false;
+            }
+        });
+    });
+    // ]]>
+</script>
+[% END %]
 [% IF ( op_else ) %]
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
@@ -135,12 +149,13 @@ $(document).ready(function() {
 <style type="text/css">
 h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { display : none; }
 .overlay { top: 180px; left: 50%; position: absolute; margin-left: -100px; width: 200px; text-align: center; display: none; margin-top: -10px; background: #eeffd4; padding: .5em; color: #000; } .note { -moz-border-radius: 3px; border-radius:3px; background: transparent url("[% interface %]/[% theme %]/img/famfamfam/silk/comment.png") top left no-repeat; padding : 1px 3px 1px 18px; font-size : 90%; }
-</style>[% ELSE %]
-<script type="text/javascript">
-// <![CDATA[
-$(document).ready(function() { calcNewsuggTotal(); });
-// ]]>
-</script>
+</style>[% END %]
+[% IF ( op_save )  %]
+    <script type="text/javascript">
+        // <![CDATA[
+        $(document).ready(function() { calcNewsuggTotal(); });
+        // ]]>
+    </script>
 [% END %]
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 </head>
@@ -150,12 +165,13 @@ $(document).ready(function() { calcNewsuggTotal(); });
 <div id="breadcrumbs">
     <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
     [% IF ( op_save ) %]
-        <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a> &rsaquo;
-        [% IF ( op == 'show' ) %]
-            Show suggestion #[% suggestionid %]
+        [% IF ( suggestionid ) %]
+            <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a> &rsaquo;  Edit suggestion #[% suggestionid %]
         [% ELSE %]
-            Suggestion edit #[% suggestionid %]
+            <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a> &rsaquo; Add suggestion
         [% END %]
+    [% ELSIF ( op == 'show' ) %]
+           <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a> &rsaquo; Show suggestion #[% suggestionid %]
     [% ELSE %]
         Suggestions management
     [% END %]
@@ -167,6 +183,11 @@ $(document).ready(function() { calcNewsuggTotal(); });
     <div id="yui-main">
     <div class="yui-b">
 
+    <div id="toolbar" class="btn-toolbar">
+        <a class="btn btn-small" id="editsuggestion" href="suggestion.pl?op=edit&amp;suggestionid=[% suggestionid %]"><i class="icon-pencil"></i> Edit</a>
+        <a class="btn btn-small" id="deletesuggestion" href="suggestion.pl?op=delete&amp;edit_field=[% suggestionid %]"><i class="icon-remove"></i> Delete</a>
+    </div>
+
     <fieldset class="rows">
       <legend>Bibliographic information</legend>
       <ol>
@@ -265,7 +286,9 @@ $(document).ready(function() { calcNewsuggTotal(); });
       </ol>
     </fieldset>
 
-    <a class="cancel" href="suggestion.pl">&lt;&lt;Back to the list</a>
+    <fieldset class="action">
+        <a href="suggestion.pl">&lt;&lt; Back to suggestions</a>
+    </fieldset>
 
     </div>
     </div>
@@ -310,7 +333,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
        <ol>
             [% IF ( suggestionid ) %]
                 <li>
-                    <label for="status">Status:</label>
+                    <label for="STATUS">Status:</label>
                     <select id="STATUS" name="STATUS">
                         <option value="">No Status</option>
 
@@ -386,6 +409,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
 			<input type="text" size="10" id="quantity" name="quantity" value="[% quantity %]" onchange="calcNewsuggTotal();" />
                 </li><li><label for="currency">Currency:</label>
 		        [% FOREACH loop_currenc IN loop_currency %]
+                    <input type="hidden" value="[% loop_currenc.rate %]" id="currency_rate_[% loop_currenc.currcode %]" name="currency_rate_[% loop_currenc.currcode %]" />
 		            <input type="hidden" id="[% loop_currenc.currcode %]" name="[% loop_currenc.currcode %]" value="[% loop_currenc.rate %]" />
 		        [% END %]
             <select name="currency" id="currency" onchange="calcNewsuggTotal();">
@@ -398,7 +422,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
 			<input type="text" readonly="readonly" id="total" name="total" size="10" value="[% total %]"/>
                 </li></ol>
     </fieldset><input type="hidden" id="returnsuggested" name="returnsuggested" value="[% IF ( returnsuggestedby ) %][% returnsuggestedby %][% ELSE %]noone[% END %]"/>
-    <fieldset class="action"><input type="hidden" name="op" value="[% op %]" />[% IF ( suggestionid ) %]<input type="submit" value="Save" /> <a class="cancel" href="[% IF ( returnsuggestedby ) %]/cgi-bin/koha/members/moremember.pl?borrowernumber=[% returnsuggestedby %]#suggestions[% ELSE %]suggestion.pl[% END %]">Cancel</a>[% ELSE %]<input type="submit" value="Submit Your Suggestion" /> <a class="cancel" href="suggestion.pl">Cancel</a>[% END %]
+    <fieldset class="action"><input type="hidden" name="op" value="[% op %]" />[% IF ( suggestionid ) %]<input type="submit" value="Save" /> <a class="cancel" href="[% IF ( returnsuggestedby ) %]/cgi-bin/koha/members/moremember.pl?borrowernumber=[% returnsuggestedby %]#suggestions[% ELSE %]suggestion.pl[% END %]">Cancel</a>[% ELSE %]<input type="submit" value="Submit your suggestion" /> <a class="cancel" href="suggestion.pl">Cancel</a>[% END %]
     </fieldset>
     </form>
 [% END %]
-- 
1.7.9.5