Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

1110 : Balance carts and lists, follow-up

Browse source 
Merge fix
This commit is contained in:
Henri-Damien LAURENT 2009-09-28 11:33:20 +02:00
parent d4f06e5023
commit 3b5beba492
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
View file

@ -223,7 +223,6 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('
INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('pdfformat','pdfformat/example.pl','Détermine le script utilisé pour imprimer les groupes de paniers','','free');
INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('CurrencyFormat','US','US|FR','Précise comment les montant financiers sont affichés. Ex: \'36000\' est affiché \'360 000,00\' en \'FR\' ou 360,000.00\' en \'US\'.','Choice');
INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('AcqCreateItem','ordering','ordering|receiving|cataloguing','Indique quand les exemplaires sont créés : à la commande, à la réception, dans le module catalogage','Choice');
>>>>>>> Updatedatabase (big):installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowRenewalLimitOverride', '0', "S'il est activé, autorise le dépassement des limites du renouvellement sur la page de circulation",NULL,'YesNo');
INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('OPACDisplayRequestPriority','0','','Afficher l\'ordre des réservation pour les adhérents á l\'opac','YesNo');
INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'UseBranchTransferLimits', '0', '', 'If ON, Koha will will use the rules defined in branch_transfer_limits to decide if an item transfer should be allowed.', 'YesNo');

15
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
View file

@ -177,16 +177,12 @@ function GetZ3950Terms(){
<!-- TMPL_INCLUDE NAME="header.inc" -->
<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
<div id="breadcrumbs">
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
&rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>
&rsaquo; Search <!-- TMPL_IF NAME="query_desc" -->for '<!-- TMPL_VAR NAME="query_desc" ESCAPE="html"-->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" -->&nbsp;with limit(s):&nbsp;'<!-- TMPL_VAR NAME="limit_desc" -->'<!-- /TMPL_IF -->
</div>
=======
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> &rsaquo; Search <!-- TMPL_IF NAME="query_desc" -->for '<!-- TMPL_VAR NAME="query_desc" -->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" -->&nbsp;with limit(s):&nbsp;'<!-- TMPL_VAR NAME="limit_desc" -->'<!-- /TMPL_IF --></div>
>>>>>>> cefbb72... Ticket 1110 : Balance carts and lists:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
<div id="doc3" class="yui-t1">
<div id="bd">
<div id="yui-main">
@ -235,22 +231,15 @@ function GetZ3950Terms(){
<a href="#" onclick="selectAll(); return false;">Select All</a>
|
<a href="#" onclick="clearAll(); return false;">Clear All</a>
<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
|
<a href="#" class="highlight_toggle" id="highlight_toggle_off">Unhighlight</a>
<a href="#" class="highlight_toggle" id="highlight_toggle_on">Highlight</a>
=======
<span class="addto"></span>
>>>>>>> cefbb72... Ticket 1110 : Balance carts and lists:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
<!-- TMPL_IF NAME="CAN_user_reserveforothers" -->
| <a href="/cgi-bin/koha/catalogue/search.pl" onclick="placeHold(); return false;">Place Hold</a>
<!-- /TMPL_IF -->
<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
<input type="button" onclick="addToList(); return false;" value="Add to List"/>
<span class="addto"></span>
<!-- TMPL_IF NAME="CAN_user_editcatalogue" --><input type="button" onclick="PopupZ3950(); return false;" value="z39.50 Search"/><!-- /TMPL_IF -->
=======
>>>>>>> cefbb72... Ticket 1110 : Balance carts and lists:koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
</div>
</div>
<!-- TMPL_IF NAME="stopwords_removed" --><div><p class="tip">Ignored the following common words: "<!-- TMPL_VAR NAME="stopwords_removed" -->"<p></div><!-- /TMPL_IF -->