Stéphane Delaune [Tue, 19 Jul 2011 09:05:56 +0000 (11:05 +0200)]
(MT #7010) add search on categorycode in SearchMember
(cherry picked from commit
1ba2bd8a2c835b2660ce1384e16cdb42bd2c59c4)
Claire Hernandez [Wed, 3 Aug 2011 10:00:40 +0000 (12:00 +0200)]
(MT #7277) add TMPL's nl2br support for subscription's notes displaying
(cherry picked from commit
53ee625f54cf3b75e280a9bc6f4c203b89acfbb4)
Conflicts solved:
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
Julian Maurice [Wed, 3 Aug 2011 09:34:35 +0000 (11:34 +0200)]
Merge remote-tracking branch 'origin/itt/ft/MT6871' into dev/unilim
Solved conflicts:
koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
Claire Hernandez [Wed, 3 Aug 2011 08:51:17 +0000 (10:51 +0200)]
Merge remote branch 'origin/dev/stetienne' into dev/unilim
Claire Hernandez [Wed, 3 Aug 2011 08:51:02 +0000 (10:51 +0200)]
Merge remote branch 'origin/dev/solr' into dev/stetienne
Stéphane Delaune [Thu, 7 Jul 2011 13:12:32 +0000 (15:12 +0200)]
(MT #6760) add location_description support on opac-basket
(cherry picked from commit
2cb267be7ae4b994608a1da2106002b0346075ec)
Jonathan Druart [Wed, 3 Aug 2011 08:08:04 +0000 (10:08 +0200)]
[SOLR]MT7483 Hide coded field link in advsearch
Stéphane Delaune [Tue, 26 Jul 2011 09:47:08 +0000 (11:47 +0200)]
(MT #6691) field lostcomment forget in borrowers table in kohastructure
this field is already in updatedatabase
(cherry picked from commit
a55b5deafe85485b79adccca7e100b083bd78775)
Claire Hernandez [Tue, 2 Aug 2011 15:37:43 +0000 (17:37 +0200)]
Merge remote branch 'remotes/origin/solr/bug/MIN/MT6772' into dev/unilim
Stéphane Delaune [Thu, 7 Jul 2011 13:12:32 +0000 (15:12 +0200)]
(MT #6760) add location_description support on opac-basket
(cherry picked from commit
2cb267be7ae4b994608a1da2106002b0346075ec)
Claire Hernandez [Tue, 2 Aug 2011 15:16:27 +0000 (17:16 +0200)]
Merge remote branch 'origin/dev/stetienne' into dev/unilim
Claire Hernandez [Tue, 2 Aug 2011 15:16:10 +0000 (17:16 +0200)]
Merge remote branch 'remotes/origin/stetienne/ft/MT7366' into dev/stetienne
Julian Maurice [Fri, 29 Apr 2011 15:16:18 +0000 (17:16 +0200)]
MT6639: getItemsInfos was not parsing the right xsl file
(cherry picked from commit
4fd96bb7fa7ebdb84f6c3191db676cdd110951ed)
Claire Hernandez [Tue, 2 Aug 2011 14:55:19 +0000 (16:55 +0200)]
Merge remote branch 'origin/dev/stetienne' into dev/unilim
Claire Hernandez [Tue, 2 Aug 2011 14:54:52 +0000 (16:54 +0200)]
Merge remote branch 'origin/dev/solr' into dev/stetienne
Jonathan Druart [Fri, 29 Jul 2011 12:51:02 +0000 (14:51 +0200)]
[SOLR] FIX drag and drop rows in indexes.pl
replace ui.sortable.js with tableDnD.js
Jonathan Druart [Fri, 29 Jul 2011 12:51:02 +0000 (14:51 +0200)]
[SOLR] FIX drag and drop rows in indexes.pl
replace ui.sortable.js with tableDnD.js
Jonathan Druart [Tue, 26 Jul 2011 11:07:32 +0000 (13:07 +0200)]
[SOLR]MT7325: Add sort facets based on order in indexes.pl
Julian Maurice [Fri, 29 Jul 2011 07:24:11 +0000 (09:24 +0200)]
Ignore empty words when building stopwords list
_new_stopwords stopped his work when it met an empty stopword. It now
continues through the end.
Jonathan Druart [Thu, 28 Jul 2011 14:59:53 +0000 (16:59 +0200)]
MT6871: FIX when uncheck a biblio
Just one context is useful
Jonathan Druart [Thu, 28 Jul 2011 12:50:51 +0000 (14:50 +0200)]
MT6871: FIX $.unique doesn't work with String
This function only works on plain JavaScript arrays
of DOM elements, and is chiefly used internally by jQuery.
Jonathan Druart [Thu, 28 Jul 2011 09:20:36 +0000 (11:20 +0200)]
Merge remote branch 'origin/solr/ft/MT7142' into dev/solr
Julian Maurice [Thu, 28 Jul 2011 07:11:07 +0000 (09:11 +0200)]
Merge branch 'stetienne/ft/MT7417' into dev/stetienne
Julian Maurice [Wed, 27 Jul 2011 12:19:12 +0000 (14:19 +0200)]
Merge branch 'stetienne/ft/MT7461' into dev/stetienne
Claire Hernandez [Wed, 27 Jul 2011 10:54:53 +0000 (12:54 +0200)]
Merge remote branch 'origin/dev/stetienne' into dev/unilim
Claire Hernandez [Wed, 27 Jul 2011 10:54:32 +0000 (12:54 +0200)]
Merge remote branch 'origin/dev/solr' into dev/stetienne
Jonathan Druart [Tue, 26 Jul 2011 10:03:48 +0000 (12:03 +0200)]
[SOLR] MT7460: FIX Can't call method "field" on an undefined value
FIX Can't call method "field" on an undefined value at C4/Search.pm line 1683
caused by an indexation from another DB
Julian Maurice [Tue, 26 Jul 2011 08:23:22 +0000 (10:23 +0200)]
Merge branch 'stetienne/ft/MT6615' into dev/stetienne
Julian Maurice [Tue, 26 Jul 2011 08:20:03 +0000 (10:20 +0200)]
Merge branch 'stetienne/ft/MT6729' into dev/stetienne
Julian Maurice [Tue, 26 Jul 2011 08:04:35 +0000 (10:04 +0200)]
Merge branch 'stetienne/ft/MT7416' into dev/stetienne
Jonathan Druart [Mon, 25 Jul 2011 15:42:59 +0000 (17:42 +0200)]
[SOLR][FACETS] FIX ccode/itype in opac advsearch
Jonathan Druart [Mon, 25 Jul 2011 14:59:53 +0000 (16:59 +0200)]
[SOLR][FACETS] Add colons and quotes support
Julian Maurice [Mon, 25 Jul 2011 11:16:50 +0000 (13:16 +0200)]
MT6729: Fix inactive subscriptions filters display
Move call to jQuery.tabs after creation of table filters. I don't know
why, but it broke filter display of second tab.
Jonathan Druart [Mon, 25 Jul 2011 09:14:49 +0000 (11:14 +0200)]
[SOLR] FIX itemcallnumber index name
Replace all 'callnum' in tmpl files with 'itemcallnumber'
Julian Maurice [Mon, 25 Jul 2011 08:19:51 +0000 (10:19 +0200)]
MT7461: Fix template to have correct translated templates
HTML::Template tags nested into HTML tags caused translator to produce
invalid/wrong template.
Julian Maurice [Fri, 22 Jul 2011 14:39:55 +0000 (16:39 +0200)]
Merge branch 'stetienne/ft/MT7344' into dev/stetienne
Julian Maurice [Fri, 22 Jul 2011 14:32:46 +0000 (16:32 +0200)]
MT6615: Add 'Authority type' column in search results
Julian Maurice [Fri, 22 Jul 2011 14:12:05 +0000 (16:12 +0200)]
MT6615: Fix authority summary building
Before this fix, we were looping through all fields and subfields to
find a match in the summary. Moreover, the field values were not placed
in the order the librarian wrote.
Now, we parse the summary from beginning to end, replacing tags with
the corresponding value, in one pass.
It is cleaner and much more efficient.
Henri-Damien LAURENT [Fri, 22 Jul 2011 14:00:45 +0000 (16:00 +0200)]
Merge branch 'solr/bug/MT7381' into dev/unilim
Henri-Damien LAURENT [Tue, 7 Jun 2011 04:49:41 +0000 (06:49 +0200)]
Adding support for customised authtypes in GuessAuthTypeCode
The bulkmarcimport in 3.0 could take a parameter --authtypes with a yaml file
containing mapping an auth record field with an authtypecode.
This patch reintroduces that feature.
Henri-Damien LAURENT [Fri, 22 Jul 2011 13:50:15 +0000 (15:50 +0200)]
Merge branch 'solr/bug/MT7381' into dev/unilim
Henri-Damien LAURENT [Fri, 22 Jul 2011 13:36:15 +0000 (15:36 +0200)]
[SOLR] MT7381 SUDOC migration SOLR Integration
Julian Maurice [Thu, 21 Jul 2011 12:45:11 +0000 (14:45 +0200)]
Merge branch 'stetienne/ft/MT7059' into dev/stetienne
Julian Maurice [Thu, 21 Jul 2011 12:43:23 +0000 (14:43 +0200)]
Merge branch 'stetienne/ft/MT7249' into dev/stetienne
Julian Maurice [Tue, 12 Jul 2011 09:39:43 +0000 (11:39 +0200)]
MT7249: Use budget_expend and budget_encumb
These fields can be used to warn a user when he exceed a fixed amount
for a budget (budget_expend), or a percentage of this budget
(budget_encumb).
Julian Maurice [Wed, 6 Jul 2011 11:41:12 +0000 (13:41 +0200)]
MT7249 Warn if an order will exceed allowed budget
Julian Maurice [Thu, 21 Jul 2011 12:35:36 +0000 (14:35 +0200)]
Merge branch 'stetienne/ft/MT7256' into dev/stetienne
Julian Maurice [Mon, 11 Jul 2011 14:35:22 +0000 (16:35 +0200)]
MT7256: Show statistic dropbox depending on selected fund
Julian Maurice [Wed, 20 Jul 2011 14:54:35 +0000 (16:54 +0200)]
[SOLR] MT7442: Allow Z39.50 server to send Unimarc
RPN2Solr.pm Z39.50 server will now respond to "Unimarc syntax" requests.
This is done by adding two lines in etc/zebraconf.xml, and a
modification of fetch_handler sub:
Depending on Koha system preference 'marcflavour', parameter
REP_FORM is set to the corresponding OID (found in
Net::Z3950::OID) which, in theory, enforce the response format,
whatever it is (except for xml format).
But, retrieving a Unimarc record is done by
MARC::Record->as_usmarc and I don't know if it's a good thing.
For zebraconf.xml, I added two "<retrieval/>" elements. At least one is
mandatory. I really have no idea why these two elements, but that's the
way usmarc and xml are written...
Julian Maurice [Thu, 21 Jul 2011 08:59:34 +0000 (10:59 +0200)]
MT7344: Fix checking of budget permissions
Budget permissions checking in aqbudgets.pl and aqplan.pl was wrong,
which caused authorised user not being allowe to modify fund.
Julian Maurice [Thu, 21 Jul 2011 08:24:33 +0000 (10:24 +0200)]
MT7417: modify batchupdateISBNs.pl to also remove spaces
Only updated biblioitemnumber are shown.
Show the number of updated marcxml too.
Julian Maurice [Wed, 20 Jul 2011 12:20:23 +0000 (14:20 +0200)]
Merge branch 'stetienne/ft/MT7415' into dev/stetienne
Claire Hernandez [Wed, 20 Jul 2011 10:42:53 +0000 (12:42 +0200)]
Merge remote branch 'origin/dev/stetienne' into dev/unilim
Stéphane Delaune [Wed, 20 Jul 2011 08:05:34 +0000 (10:05 +0200)]
(MT #6772) fix addbooks.pl search on import_biblios
Julian Maurice [Wed, 20 Jul 2011 07:20:42 +0000 (09:20 +0200)]
Merge branch 'stetienne/ft/MT7156' into dev/stetienne
Julian Maurice [Wed, 20 Jul 2011 07:11:25 +0000 (09:11 +0200)]
Merge branch 'stetienne/ft/MT7268' into dev/stetienne
Julian Maurice [Wed, 20 Jul 2011 07:09:34 +0000 (09:09 +0200)]
Merge branch 'stetienne/ft/MT7252' into dev/stetienne
Julian Maurice [Wed, 20 Jul 2011 07:07:48 +0000 (09:07 +0200)]
Merge branch 'stetienne/ft/MT6714' into dev/stetienne
Julian Maurice [Wed, 20 Jul 2011 07:05:12 +0000 (09:05 +0200)]
Merge branch 'stetienne/ft/MT5845' into dev/stetienne
Julian Maurice [Wed, 20 Jul 2011 07:02:03 +0000 (09:02 +0200)]
Merge branch 'stetienne/ft/MT6729' into dev/stetienne
Julian Maurice [Wed, 20 Jul 2011 06:59:33 +0000 (08:59 +0200)]
Merge branch 'stetienne/ft/MT7159' into dev/stetienne
Julian Maurice [Wed, 20 Jul 2011 06:58:01 +0000 (08:58 +0200)]
Merge branch 'stetienne/ft/MT7150' into dev/stetienne
Solved conflicts:
koha-tmpl/intranet-tmpl/prog/en/js/datatables.js
Julian Maurice [Tue, 19 Jul 2011 15:39:55 +0000 (17:39 +0200)]
MT5845: Show the type (user/owner) we are searching for
Claire Hernandez [Tue, 19 Jul 2011 13:18:18 +0000 (15:18 +0200)]
Merge remote branch 'origin/dev/stetienne' into wip/unilim
Claire Hernandez [Tue, 19 Jul 2011 13:17:57 +0000 (15:17 +0200)]
Merge remote branch 'origin/dev/solr' into dev/stetienne
Julian Maurice [Tue, 19 Jul 2011 10:14:00 +0000 (12:14 +0200)]
MT7415: Wrong service name for CAS authentification
When behind a proxy, Koha give a wrong service name to CAS server
(SCRIPT_URI environment variable). It now uses OPACBaseURL syspref.
Claire Hernandez [Tue, 19 Jul 2011 08:17:40 +0000 (10:17 +0200)]
[SOLR] Follow-up - Definitely rename plugin PubDate with Date
- little updatedatabase to change existing databases
Julian Maurice [Fri, 15 Jul 2011 12:13:57 +0000 (14:13 +0200)]
MT7059: Missing COinS in OPAC and intranet search results
Julian Maurice [Fri, 15 Jul 2011 09:22:17 +0000 (11:22 +0200)]
MT7416: Fix create_input sub
Default values were not applied.
Julian Maurice [Fri, 15 Jul 2011 07:43:41 +0000 (09:43 +0200)]
MT5854/MT5836 merge issue
Jonathan Druart [Wed, 13 Jul 2011 14:58:13 +0000 (16:58 +0200)]
Merge remote branch 'origin/stetienne/ft/MT6808' into dev/stetienne
Julian Maurice [Mon, 11 Jul 2011 12:33:56 +0000 (14:33 +0200)]
MT7268: Fix sorting on suppliers name
Julian Maurice [Mon, 11 Jul 2011 12:23:43 +0000 (14:23 +0200)]
MT7268: Display only suppliers which have displayable orders
and sort the list alphabetically.
Jonathan Druart [Wed, 13 Jul 2011 14:00:34 +0000 (16:00 +0200)]
Merge remote branch 'origin/dev/solr' into dev/stetienne
Conflicts solved:
installer/data/mysql/en/mandatory/sysprefs.sql
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
installer/data/mysql/updatedatabase.pl
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
kohaversion.pl
Jonathan Druart [Wed, 13 Jul 2011 13:54:18 +0000 (15:54 +0200)]
[SOLR] Facets Multivalued
Conflicts solved:
C4/Search/Engine/Solr.pm
[SOLR] Followup: Facets Multivalued
[SOLR] Followup: Facets Multivalued
[SOLR] Followup: Facets Multivalued
[SOLR] Followup: Facets Multivalued
[SOLR] Followup: Facets Multivalued
[SOLR] Followup: Facets Multivalued
[SOLR] Followup: Facets Multivalued
[SOLR] Followup: Facets Multivalued
Jonathan Druart [Wed, 13 Jul 2011 13:50:08 +0000 (15:50 +0200)]
Merge remote branch 'origin/solr/ft/MT7004' into dev/solr
Jonathan Druart [Wed, 13 Jul 2011 13:48:45 +0000 (15:48 +0200)]
Merge remote branch 'origin/solr/ft/MT7233' into dev/solr
Julian Maurice [Wed, 13 Jul 2011 13:43:52 +0000 (15:43 +0200)]
MT6615: Use authtypecode to build summary
Jonathan Druart [Wed, 13 Jul 2011 13:00:07 +0000 (15:00 +0200)]
[SOLR] Followup : Support for searching in index of type date
Julian Maurice [Wed, 13 Jul 2011 12:04:00 +0000 (14:04 +0200)]
MT7159: Force Basket column to be treated as html
Julian Maurice [Tue, 12 Jul 2011 07:30:33 +0000 (09:30 +0200)]
MT7159: Show basket name instead of only basketno
Affected pages are invoices.pl and lateorders.pl
Julian Maurice [Wed, 13 Jul 2011 11:55:51 +0000 (13:55 +0200)]
MT7150: Factorize datatables.js
Code for sorting 'htmlbasketno' and 'totalcost' has been factorized.
Function for sorting 'htmlbasketno' has been a little bit improved
(retrieving basketno is more accurate).
Types of corresponding columns in lateorders.pl are now explicitely
indicated.
Jonathan Druart [Wed, 13 Jul 2011 10:43:23 +0000 (12:43 +0200)]
[SOLR] Definitely rename plugin PubDate with Date
Julian Maurice [Wed, 13 Jul 2011 10:20:40 +0000 (12:20 +0200)]
MT7344: Fix a copy/paste issue
and reorder budget permissions dropdown list. Values are not changed,
"Owner + Users + Library" is in 4th position but its value is still 2,
it's ugly but this way budget permissions are still consistent.
Julian Maurice [Wed, 13 Jul 2011 09:43:32 +0000 (11:43 +0200)]
MT7252: Change branch filter dropdown list
Only branches which have an associated fund displayable are pushed in
the branch filter dropdown list.
Julian Maurice [Tue, 12 Jul 2011 15:05:05 +0000 (17:05 +0200)]
Merge branch 'stetienne/ft/MT5836' into dev/stetienne
Julian Maurice [Tue, 12 Jul 2011 15:01:47 +0000 (17:01 +0200)]
Merge branch 'stetienne/ft/MT7267' into dev/stetienne
Julian Maurice [Tue, 12 Jul 2011 14:59:45 +0000 (16:59 +0200)]
Merge branch 'stetienne/ft/MT7267' into dev/stetienne
Julian Maurice [Tue, 12 Jul 2011 14:59:00 +0000 (16:59 +0200)]
Merge branch 'stetienne/ft/MT7161' into dev/stetienne
Julian Maurice [Tue, 12 Jul 2011 14:56:59 +0000 (16:56 +0200)]
Merge branch 'stetienne/ft/MT7250' into dev/stetienne
Julian Maurice [Tue, 12 Jul 2011 14:55:55 +0000 (16:55 +0200)]
Merge branch 'stetienne/ft/MT5546' into dev/stetienne
Julian Maurice [Tue, 12 Jul 2011 14:54:42 +0000 (16:54 +0200)]
Merge branch 'stetienne/ft/MT6523' into dev/stetienne
Julian Maurice [Tue, 12 Jul 2011 14:53:49 +0000 (16:53 +0200)]
Merge branch 'stetienne/ft/MT7255' into dev/stetienne
Julian Maurice [Tue, 12 Jul 2011 14:52:15 +0000 (16:52 +0200)]
Merge branch 'stetienne/ft/MT7343' into dev/stetienne
Julian Maurice [Thu, 7 Jul 2011 14:56:13 +0000 (16:56 +0200)]
MT7252: Filter on funds now just works
The problem was caused by a deletion of some keys in $input->Vars hash
just before trying to retrieve filter parameters.
Julian Maurice [Mon, 11 Jul 2011 15:21:02 +0000 (17:21 +0200)]
Merge branch 'stetienne/ft/MT6543' into dev/stetienne
Julian Maurice [Mon, 11 Jul 2011 15:11:26 +0000 (17:11 +0200)]
MT7156: aqplan: Remove some planning types
Planning type dropbox was containing duplicated values, empty value, and
values which have not their place here.
Also fix the Planning button.
Julian Maurice [Mon, 11 Jul 2011 10:31:56 +0000 (12:31 +0200)]
MT6714: Erase enddate when changing frequency or sub length
Julian Maurice [Mon, 11 Jul 2011 09:50:16 +0000 (11:50 +0200)]
MT7150: Add datatables types: totalcost and htmlbasketno
If cell data looks like:
2.50x3 = 7.50
Fund Name
column is sorted using total (3rd number), and fund name, in this order.
If cell data contains a link which looks like:
<a href="basket.pl?basketno=XXX">XXX</a> ....
column is sorted using XXX, and following text, in this order.
Julian Maurice [Fri, 8 Jul 2011 14:41:15 +0000 (16:41 +0200)]
MT7344: Change fund restriction 'library' => 'lib + owner + users'