synch'ing head and rel_2_2 (from 2.2.5, including npl templates)
Seems not to break too many things, but i'm probably wrong here.
at least, new features/bugfixes from 2.2.5 are here (tested on some features on my head local copy)
- removing useless directories (koha-html and koha-plucene)
$strsth.=" AND aqbasket.booksellerid = $supplierid "if($supplierid);
$strsth.=" AND borrowers.branchcode like \'".$branch."\'"if($branch);
$strsth.=" AND borrowers.branchcode like \'".C4::Context->userenv->{branch}."\'"if(C4::Context->preference("IndependantBranches")&&C4::Context->userenv&&C4::Context->userenv->{flags}!=1);
$strsth.=" ORDER BY latesince,basketno,borrowers.branchcode, supplier";
$strsth.=" HAVING quantity<>0 AND unitpricesupplier<>0 AND unitpricelib<>0 ORDER BY latesince,basketno,borrowers.branchcode, supplier";
}else{
$strsth="SELECTaqbasket.basketno,
DATE(aqbasket.closedate)asorderdate,
@ -613,13 +618,14 @@ sub getlateorders {
$strsth.=" AND borrowers.branchcode like \'".C4::Context->userenv->{branch}."\'"if(C4::Context->preference("IndependantBranches")&&C4::Context->userenv->{flags}!=1);
$strsth.=" ORDER BY latesince,basketno,borrowers.branchcode, supplier";
my$sth2=$dbh->prepare("update borrowers set firstname=?,surname=?,initials=?,streetaddress=?,city=?,phone=?, categorycode=?,branchcode=?,emailaddress=?,sort1=? where cardnumber=?");
$sth=$dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblio.biblionumber=?");
$sth=$dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblio.biblionumber=? order by title");
$sth->execute($biblionumber);
}else{
if($ISSNand$title)
{
$sth=$dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and (biblio.title like ? or biblioitems.issn = ? )");
$sth=$dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and (biblio.title like ? or biblioitems.issn = ? order by title )");
$sth->execute("%$title%",$ISSN);
}
else
{
if($ISSN)
{
$sth=$dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblioitems.issn = ?");
$sth=$dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblioitems.issn = ? order by title");
$sth=$dbh->prepare("update suggestions set status=? where suggestionid=?");
$sth->execute($status,$suggestionid);
}
}
# check mail sending.
@ -233,6 +244,14 @@ sendmail(%mail);
# warn "sending email to $emailinfo->{byemail} from $emailinfo->{libemail} to notice new status $emailinfo->{status} for $emailinfo->{title} / $emailinfo->{author}";
}
subfindsuggestion_from_biblionumber{
my($dbh,$biblionumber)=@_;
my$sth=$dbh->prepare("select suggestionid from suggestions where biblionumber=?");
my$strsth="select reservedate,reserves.borrowernumber as bornum, concat(firstname,' ',surname) as borrower, borrowers.phone, borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, notificationdate, reminderdate, priority, reserves.found, biblio.title, biblio.author from reserves left join items on items.itemnumber=reserves.itemnumber, borrowers,biblio where isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && reserves.biblionumber=biblio.biblionumber order by reservedate, borrower ";
$strsth="select reservedate,reserves.borrowernumber as bornum,concat(firstname,' ',surname) as borrower, borrowers.phone, borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, notificationdate, reminderdate, priority, reserves.found, biblio.title, biblio.author from reserves left join items on items.itemnumber=reserves.itemnumber , borrowers,biblio where isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && reserves.biblionumber=biblio.biblionumberorder by borrower,reservedate "if($ordereq"borrower");
$strsth="select reservedate,reserves.borrowernumber as bornum,concat(firstname,' ',surname) as borrower, borrowers.phone, borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, notificationdate, reminderdate, priority, reserves.found, biblio.title, biblio.author from reserves left join items on items.itemnumber=reserves.itemnumber, borrowers,biblio where isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && reserves.biblionumber=biblio.biblionumber order by biblio.title, priority,reservedate "if($ordereq"biblio");
$sth=$dbh->prepare("select bibid from marc_biblio where bibid >=? and bibid <=? order by bibid");
$sth->execute($start_bib,$end_bib);
}else{
$sth=$dbh->prepare("select bibid from marc_biblio order by bibid");
$sth->execute();
$strsth.=" where biblionumber>=$start_bib and biblionumber<=$end_bib ";
}elsif($format){
if($strsth=~/ where/){
$strsth=~s/ where (.*)/,biblioitems where biblioitems.biblionumber=marc_biblio.biblionumber and biblioitems.itemtype=\'$format\' and $1/;
}else{
$strsth.=",biblioitems where biblioitems.biblionumber=marc_biblio.biblionumber and biblioitems.itemtype=\'$format\'";
}
}elsif($branch){
if($strsth=~/ where/){
$strsth=~s/ where (.*)/,items where items.biblionumber=marc_biblio.biblionumber and items.homebranch=\'$branch\' and $1/;
}else{
$strsth.=",items where items.biblionumber=marc_biblio.biblionumber and items.homebranch=\'$branch\'";
}
}elsif($start_callnumber&&$end_callnumber){
$start_callnumber=~s/\*/\%/g;
$start_callnumber=~s/\?/\_/g;
$end_callnumber=~s/\*/\%/g;
$end_callnumber=~s/\?/\_/g;
if($strsth=~/,items/){
$strsth.=" and items.itemcallnumber between \'$start_callnumber\' and \'$end_callnumber\'";
}else{
if($strsth=~/ where/){
$strsth=~s/ where (.*)/,items where items.biblionumber=marc_biblio.biblionumber and items.itemcallnumber between \'$start_callnumber\' and \'$end_callnumber\' and $1/;
}else{
$strsth=~",items where items.biblionumber=marc_biblio.biblionumber and items.itemcallnumber between \'$start_callnumber\' and \'$end_callnumber\' ";
}
}
}
while(my($bibid)=$sth->fetchrow){
$strsth.=" order by marc_biblio.biblionumber ";
$strsth.="LIMIT 0,$limit "if($limit);
warn"requête marc.pl : ".$strsth;
my$req=$dbh->prepare($strsth);
$req->execute;
while(my($bibid)=$req->fetchrow){
my$record=MARCgetbiblio($dbh,$bibid);
print$record->as_usmarc();
}
}else{
my$sth=$dbh->prepare("Select itemtype,description from itemtypes order by description");
<tr> <td> Total cols</td> <td> total col1</td> <td> total col2</td> <td> Global total</td> </tr>
</table></p>
<p> For instance, if you choose to check row for Borrower Category Column for Branches, you will be displayed a table containing the different borrowers categorycodes on rows, and different branchcodes on columns as such :
</p><p> You can choose to display the results on screen or get them in your office suite (would it be gnucalc, oocalc, or another calc) with the radio button display. You can change the set of the file generated changing Export in the textarea.
</p>
<p>
<h2> Criteria on row/column</h2>
<ul> <li>You can choose sort1 sort2 if filled.</li>
<li>You can choose Branch, zipcode or categorycode.</li>
<li>If you chose zipcode, since the 2 first digits in France represents the country (Hérault 34, Haute-Garonne 31), some may want to have stats on representation of this countries. That is why you can select to group stats on some digits of zipcode.</li>
</ul>
</p>
<p>
<h2> Filters </h2>
<ul> <li>You can filter on sort1 sort2 if filled.</li>
<li>You can filter on zipcode, branch or categorycode.</li>
<li>Branches and categorycodes are chosen in a select list.</li>
<li>Zipcode can use special characters like * for many characters. say 31* to get french people that live in Haute-Garonne</li>
<tr> <td> Total cols</td> <td> total col1</td> <td> total col2</td> <td> Global total</td> </tr>
</table></p>
<p> For instance, if you choose to check row for itemtype, Column for Branches, you will be displayed a table containing the different itemtypes on rows, and different branchcodes on columns as such :
</p><p> You can choose to display the results on screen or get them in your office suite (would it be gnucalc, oocalc, or another calc) with the radio button display. You can change the set of the file generated changing Export in the textarea.
</p>
<p>
<h2> Criteria on row/column</h2>
<ul> <li>Dewey Classification. You can group results on the n first digits</li>
<li>Callnumber. You can group results on the n first characters</li>
<li>Document Type</li>
<li>Publication Year</li>
<li>Home Branch</li>
<li>Location</li>
</ul>
</p>
<p>
<h2> Filters </h2>
<ul> <li>Callnumber and Dewey Classification can be filtered from a string to another. You can use jokers.</li>
<tr> <td> Total cols</td> <td> total col1</td> <td> total col2</td> <td> Global total</td> </tr>
</table></p>
<p> For instance, if you choose to check row for Borrower Category Column for Branches, you will be displayed a table containing the different borrowers categorycodes on rows, and different branchcodes on columns as such :
</p><p> You can choose to display the results on screen or get them in your office suite (would it be gnucalc, oocalc, or another calc) with the radio button display. You can change the set of the file generated changing Export in the textarea.
</p>
<p>
<h2> Criteria on row/column</h2>
<li>You can choose Branch, itemtype or borrower category.</li>
<li>Period you can select whether you want it to be issue or return period. </li>
<li>You can group results by day, by Month, by year. </li>
</ul>
</p>
<p>
<h2> Filters </h2>
<ul> <li>You can filter period in a From/to calendar.</li>
<li>You can choose to see only One day on the period, or one month.</li>
<li>You can filter on itemtypes, branch or borrowers category.</li>
<li>Branches itemtypes and borrowers category are chosen in a select list.</li>
</ul>
</p>
<p>
<h2> Cell Value</h2>
<p> You can choose to count
<ul> <li>distinct borrowers</li>
<li>distinct items</li>
<li>distinct issues (that is one borrower, one item)</li>
<li>circulation rate (rate items issued out of total number of items)</li>
<ahref="/cgi-bin/koha/reports/borrowers_out.pl"class="submenu reports"onMouseOver="CancelTimeOut(TID)"onMouseOut="LaunchSetOff(6)">Borrowers without issues</a>
<ahref="/cgi-bin/koha/reports/catalogue_out.pl"class="submenu reports"onMouseOver="CancelTimeOut(TID)"onMouseOut="LaunchSetOff(6)">Items not issued</a>
@ -103,10 +106,10 @@ var ns7 = (document.getElementById) ? 1:0;*/
<ahref="/cgi-bin/koha/admin/aqbookfund.pl"title="Book fund administration. Remember to edit your book funds before you start editing the budgets."class="submenu parameters"onMouseOver="CancelTimeOut(TID)"onMouseOut="TID=setTimeout('SetOff(7)',Mduration)">Book funds</a>
<ahref="/cgi-bin/koha/admin/categorie.pl"title="Define the categories of borrowers"class="submenu parameters"onMouseOver="CancelTimeOut(TID)"onMouseOut="TID=setTimeout('SetOff(7)',Mduration)">Borrower categories</a>
<ahref="/cgi-bin/koha/admin/issuingrules.pl"title="Define issuing rules for branches / borrowers / item types (nb of issues, duration, cost...)"class="submenu parameters"onMouseOver="CancelTimeOut(TID)"onMouseOut="TID=setTimeout('SetOff(7)',Mduration)">Issuing rules</a>
<hr>
<hr/>
<ahref="/cgi-bin/koha/admin/authorised_values.pl"title="Define categories and authorised values for them. Authorised values are used in MARC form to limit and help editing MARC biblios"class="submenu parameters"onMouseOver="CancelTimeOut(TID)"onMouseOut="TID=setTimeout('SetOff(7)',Mduration)">Authorised values</a>
You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.
We are pleased to inform you that the item is now part of the collection of the Nelsonville Public Library.
We are pleased to inform you that the item is now part of the collection of the library.
If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.
<h2>Un merci particulier aux financeurs suivants</h2>
<p><b>Groupement de bibliothèques de Horowhenua</b> : Rosalie Blake, directrice des bibliothèques (Koha 1.0)</p>
<p>La<b>Bibliothèque Publique de Nelsonville</b>, USA, Ohio (financement support MARC)</p>
<p>La<b>Bibliothèque Publique de Nelsonville</b>, USA, Ohio (financement support MARC)</p>
<p><b>EMN (Ecole des Mines de Nantes)</b>, France (Suggestion,module stats support LDAP amélioré)</p>
<p><b>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</b> (grilles de catalogage multiples, autorités MARC, paniers OPAC, Support périodiques)</p>
</div>
<div id="bloc25">
<h2>Contributeurs principaux pour la version 2.2</h2>
<p><input type="checkbox" value=1 name="confirm_not_duplicate">Confirmer que ce n'est pas un doublon (et cliquer sur Ajouter Notice à nouveau)</p>
<p><a href="additem.pl?bibid=<!-- TMPL_VAR name="duplicatebibid" -->" class="button catalogue">Editer les exemplaires</a> à partir de cette notice</p>
<p><input type="checkbox" value=1 name="confirm_not_duplicate">Confirmer que ce n'est pas un doublon (et cliquer sur Ajouter Notice à nouveau)</p>
<p><a href="additem.pl?biblionumber=<!-- TMPL_VAR name="duplicatebibid" -->" class="button catalogue">Editer les exemplaires</a> à partir de cette notice</p>
<p>ou <a href="histsearch.pl" class="button acquisition">Recherche dans l'historique des commandes</a></p>
<!-- /TMPL_IF -->
</div>
<!-- currencies-->
@ -37,8 +41,10 @@
<!-- showbudget-->
<div id="bloc25">
<form action="/cgi-bin/koha/search.pl">
<h2 class="acquisition">budgets et lignes de crédit</h2>
<h2 class="acquisition">budgets et lignes de crédit</h2>
<!-- TMPL_IF name="nobudget" -->
<p class="problem">Vous devez définir un budget (module paramètres)</p>
<!-- TMPL_ELSE -->
<table class="noborder">
<tr>
<th class="acquisition">Budgets</th>
@ -67,7 +73,7 @@
<p>
Utilisez le bouton rafraîchir pour avoir les chiffres les plus récents.Les chiffres communiqués le sont à titre indicatif, dans la mesure où des taux de change affecteront le montant réellement payé.
</p>
</form>
<!-- /TMPL_IF -->
</div>
<div id="bloc25">
@ -75,7 +81,7 @@
<ul>
<p>Pour débuter une acquisition, que ça soit une commande, un achat direct ou un don, rechercher tout d'abord le fournisseur, Ajoutez en un si nécessaire.</p>
<p>Puis sélectionnez un panier d'achat précédent ou créez en un nouveau. Notez que le panier d'achat sera attaché à l'utilisateur sous lequel vous êtes loggé. </p>
<p>Pour commander un document vous avez besoin de déterminer si une notice existe déjà, puis soit ajouter un exemplaire, soit créer une nouvelle notice et y ajouter l'exemplaire</p>
<p>Pour commander un document, vous avez besoin soit de déterminer si une notice existe déjà puis d'y ajouter l'exemplaire, soit de créer une nouvelle notice et d'y ajouter l'exemplaire.</p>
<p>Pour fermer un panier de commande cliquez sur "voir les paniers de commande "ou cherchez au dessus, et cliquez alors sur "valider le panier".</p>
<p><input type="checkbox" value=1 name="confirm_not_duplicate">Confirmer que ce n'est pas un doublon (et cliquer sur <input type="button" value="Ajouter autorité" onclick="Check(this.form)" accesskey="w" class="button authority"> encore)</p>
<p>Aller à <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >l'autorité</a></p>
<input type="text" size=40 maxlength=40 name="title" value="<!-- TMPL_VAR name="title" -->" title="Saisir un tire (complet ou partiel) pour filtrer les abonnements">
<p>Dernier renouvellement le <b><!-- TMPl_VAR name="startdate" --></b></p>
<!-- TMPL_IF name="enddate" --><p><b>L'abonnement est terminé. Le dernier bulletin a été reçu le <!-- TMPL_VAR name="enddate" --></b></p><!-- /TMPL_IF name="enddate" -->
<input type="submit" value="Enregistrer les changements" accesskey="w" class="button bull">
<!-- TMPL_IF name="hassubscriptionexpired" -->
<p>L'abonnement a expiré.L'état du prochain numero attendu ne peut-être changé. <a href="#" onClick="popup()" class="button bull">Renouveller</a>votre abonnement</p>
<p>L'abonnement a expiré.L'état du prochain numero attendu ne peut-être changé. <a href="#" onClick="popup()" class="button bull">Renouveler</a>votre abonnement</p>
<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Rechercher à partir des valeurs de ces champs">
<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Rechercher à partir des valeurs de ces champs">
<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Rechercher à partir des valeurs de ces champs">
<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Rechercher à partir des valeurs de ces champs">
<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Rechercher à partir des valeurs de ces champs">
<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Rechercher à partir des valeurs de ces champs">
<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Rechercher à partir des valeurs de ces champs">
<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Rechercher à partir des valeurs de ces champs">
<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Rechercher à partir des valeurs de ces champs">
<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Rechercher à partir des valeurs de ces champs">
tipaul
19 years ago
