Christophe Croullebois [Wed, 27 Jul 2011 08:31:40 +0000 (10:31 +0200)]
(MT #7400) Default framework in MARCdetail.pl
A bug cleans the screen when you choose "default".
(cherry picked from commit
21a625cd1daf6f6dcdafa4210084928509113389)
Alex Arnaud [Fri, 2 Dec 2011 10:03:00 +0000 (11:03 +0100)]
MT8455 - Changes AddReserve parameters in HoldItem ILSDI service
Adrien Saurat [Wed, 28 Dec 2011 11:26:03 +0000 (12:26 +0100)]
MT8078 : automatic copy of translated columns.def
Modified the misc/translator/translate script to automatically
copy the columns.def.fr-FR (or other language) file after
translation.
+ update of columns.def.fr-FR translation
Solved conflicts:
koha-tmpl/intranet-tmpl/prog/en/columns.def.fr-FR
Julian Maurice [Tue, 18 Sep 2012 08:16:24 +0000 (10:16 +0200)]
Merge remote-tracking branch 'origin/solr/bug/MT8048' into dev/solr
Stéphane Delaune [Wed, 7 Sep 2011 07:36:25 +0000 (09:36 +0200)]
(MT #7227) cron script to delete old entries in import's tables
it deletes from import_batches, import_records, import_biblios, import_items, import_record_matches
it takes 3 args : the "status" to delete, the "duration" integer of "laps" to delete
To delete entries with status cleaned older than 1 month :
perl ./clean_batchimport.pl -status cleaned -duration 1 -laps MONTH
Stéphane Delaune [Tue, 30 Aug 2011 14:52:56 +0000 (16:52 +0200)]
(MT #7574) add item types in opac-user Checked Out table
(cherry picked from commit
8e6703b753cba84712e705d3dfce57271bef6459)
Julian Maurice [Tue, 18 Sep 2012 07:28:42 +0000 (09:28 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9873' into dev/solr
Julian Maurice [Tue, 18 Sep 2012 07:27:16 +0000 (09:27 +0200)]
MT9873: Remove a line that was here for debugging purpose
and breaks search on staff client.
Julian Maurice [Mon, 3 Sep 2012 07:56:35 +0000 (09:56 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9198' into dev/solr
Jonathan Druart [Thu, 16 Aug 2012 10:06:04 +0000 (12:06 +0200)]
MT7578: FIX DT correct dates sorting
(cherry picked from commit
bf4c9f5649b870326937cf65b2006504fe84b1a3)
Jonathan Druart [Mon, 13 Aug 2012 13:44:08 +0000 (15:44 +0200)]
MT7578: Add links for checkall/checknone in serials-collection tables
(cherry picked from commit
de660782282486099880e3718f51943594ebc64c)
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
Jonathan Druart [Fri, 31 Aug 2012 14:18:32 +0000 (16:18 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT7578' into dev/solr
Conflicts solved:
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
Julian Maurice [Mon, 20 Aug 2012 14:22:54 +0000 (16:22 +0200)]
MT9198: Use items.itype when item-level_itypes is ON
Prevent useless JOINs on biblioitems when syspref is ON
Display itemtypes descriptions instead of codes
Jonathan Druart [Thu, 16 Aug 2012 12:56:40 +0000 (14:56 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9873' into dev/solr
Jonathan Druart [Thu, 16 Aug 2012 10:06:04 +0000 (12:06 +0200)]
MT7578: FIX DT correct dates sorting
Jonathan Druart [Mon, 13 Aug 2012 13:52:43 +0000 (15:52 +0200)]
Revert "MT7578: Add links for checkall/checknone in serials-collection tables"
This reverts commit
b5e427b6a88bd4ddaa6e9e7b01ec890a4e4633f9.
Jonathan Druart [Mon, 13 Aug 2012 13:44:08 +0000 (15:44 +0200)]
MT7578: Add links for checkall/checknone in serials-collection tables
Julian Maurice [Thu, 9 Aug 2012 09:10:43 +0000 (11:10 +0200)]
Merge remote-tracking branch 'origin/solr/ft/undefined_subroutines' into dev/solr
Julian Maurice [Wed, 8 Aug 2012 12:13:36 +0000 (14:13 +0200)]
find-undefined-subroutines.pl: All tests pass...
...using a blacklist of 4 scripts.
Julian Maurice [Mon, 6 Aug 2012 09:18:31 +0000 (11:18 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9265' into dev/solr
Julian Maurice [Thu, 26 Jul 2012 11:38:41 +0000 (13:38 +0200)]
MT9198: issues_avg_stats: code clean & several fixes
- remove a lot of Perl warnings
- per-row and per-column averages calculation was wrong
- global average was not calculated
- change label 'TOTAL' to 'AVERAGE'
- make the sql joins conditionnals, it should make queries faster
- remove useless code
Jonathan Druart [Mon, 23 Jul 2012 09:27:07 +0000 (11:27 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9936' into dev/solr
Jonathan Druart [Mon, 23 Jul 2012 08:47:10 +0000 (10:47 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9267' into dev/solr
Jonathan Druart [Mon, 23 Jul 2012 08:43:42 +0000 (10:43 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9282' into dev/solr
Jonathan Druart [Mon, 23 Jul 2012 08:33:28 +0000 (10:33 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9619' into dev/solr
Jonathan Druart [Mon, 23 Jul 2012 08:33:04 +0000 (10:33 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9638' into dev/solr
Jonathan Druart [Mon, 23 Jul 2012 08:30:33 +0000 (10:30 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9257' into dev/solr
Jonathan Druart [Mon, 23 Jul 2012 07:47:16 +0000 (09:47 +0200)]
MT9125: FIX test if *_items_loop are not undefined
Can't use an undefined value as an ARRAY reference at
/home/koha/src/opac/opac-search.pl line XXX.
Julian Maurice [Fri, 20 Jul 2012 09:48:55 +0000 (11:48 +0200)]
MT9936: GetPendingIssues: do nothing if no borrowernumbers
Claire Hernandez [Wed, 18 Jul 2012 09:10:23 +0000 (11:10 +0200)]
Merge remote-tracking branch 'remotes/origin/solr/ft/MT9775' into dev/solr
Jonathan Druart [Tue, 17 Jul 2012 09:42:17 +0000 (11:42 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT7510' into dev/solr
Jonathan Druart [Tue, 17 Jul 2012 09:39:25 +0000 (11:39 +0200)]
MT7510: Adds todo and fixme for check_consistency.pl
Jonathan Druart [Tue, 17 Jul 2012 09:24:08 +0000 (11:24 +0200)]
MT9282: FIX translations
Jonathan Druart [Tue, 17 Jul 2012 09:20:48 +0000 (11:20 +0200)]
MT9619: FIX translations
Jonathan Druart [Tue, 17 Jul 2012 08:47:50 +0000 (10:47 +0200)]
MT9638: FIX translation
Jonathan Druart [Mon, 16 Jul 2012 15:49:38 +0000 (17:49 +0200)]
Bug 9267: FIX Translation strings
Jonathan Druart [Mon, 16 Jul 2012 15:12:47 +0000 (17:12 +0200)]
MT9257: Fix html/html::template structure
Jonathan Druart [Mon, 9 Jul 2012 14:20:06 +0000 (16:20 +0200)]
Undefined_subroutines: All tests passed unless 1
The unpassed test is
sms/sms_listen_windows_start.pl : Can't locate Win32/Process.pl
christophe croullebois [Thu, 12 Jul 2012 07:49:22 +0000 (09:49 +0200)]
(MT #9573) When canceling an hold the next waiting looses barcode
In request.pl when you cancel a waiting hold, the next enters in "waiting" status, but:
in the same page, the details column shows "No Barcode "
in detail.pl, the status column shows "available" that is bad too, but:
behind the scene, it's worse, because the CancelReserve function is poorly formated.
I have just corrected this, to enable it to fill correctly the reserve table.
Jonathan Druart [Tue, 10 Jul 2012 15:16:38 +0000 (17:16 +0200)]
MT7510: Followup: We have to delete record AFTER processing
Else, we miss a lot of record.
Example:
count=100, page=1
a solr search returns 100 results.
We delete 10 results (90 to 100 for ex.)
a new solr search returns results 100 to 200, but 10 results will not be
checked (was 100 to 110).
Jonathan Druart [Wed, 4 Jul 2012 11:41:59 +0000 (13:41 +0200)]
MT9873: [SOLR] Add messages
- Add messages.inc for tmpl
- Remove useless files
- Use messages.inc for opac-search.pl and catalogue/search.pl
Jonathan Druart [Tue, 10 Jul 2012 09:10:06 +0000 (11:10 +0200)]
MT7510,9864: Add authority check for check_consistencies.pl
Jonathan Druart [Mon, 9 Jul 2012 14:32:58 +0000 (16:32 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9125' into dev/solr
Jonathan Druart [Fri, 6 Jul 2012 13:23:45 +0000 (15:23 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT8362' into dev/solr
Sophie Meynieux [Tue, 5 Jun 2012 16:25:28 +0000 (18:25 +0200)]
MT9687 : Adding a new value to 8 position of coded data field 100
From july 2012, unimarc norm evolves and the value k "monograph with both publication date and print date" must be added for this position.
Jonathan Druart [Thu, 5 Jul 2012 09:41:43 +0000 (11:41 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT6557' into dev/solr
Jonathan Druart [Thu, 5 Jul 2012 09:41:22 +0000 (11:41 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9357' into dev/solr
Julian Maurice [Wed, 4 Jul 2012 12:29:12 +0000 (14:29 +0200)]
[SOLR] Prefix GetAuthority with module name
When SimpleSearch is called in dedup_authorities.pl, it fails because of
"undefined subroutine main::GetAuthority".
Julian Maurice [Wed, 4 Jul 2012 08:44:56 +0000 (10:44 +0200)]
Merge remote-tracking branch 'origin/solr/ft/remove_unused_authorities' into dev/solr
Julian Maurice [Wed, 4 Jul 2012 08:21:58 +0000 (10:21 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT8884' into dev/solr
Jonathan Druart [Tue, 3 Jul 2012 15:01:58 +0000 (17:01 +0200)]
MT9125: Apply hideatopac for xslt
Julian Maurice [Mon, 2 Jul 2012 07:31:58 +0000 (09:31 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT8625' into dev/solr
Jonathan Druart [Thu, 7 Jun 2012 07:26:19 +0000 (09:26 +0200)]
(SOLR] MT9694 RPN2Solr: str index must be called with double quotes
str index must be called like:
index:"value"
and not:
index:'value'
Julian Maurice [Wed, 27 Jun 2012 15:21:46 +0000 (17:21 +0200)]
Merge remote-tracking branch 'origin/ft/dedup_authorities' into dev/solr
Solved conflicts:
misc/cronjobs/dedup_authorities.pl
Julian Maurice [Mon, 25 Jun 2012 13:00:35 +0000 (15:00 +0200)]
[dedup] New script dedup_authorities.pl
in misc/cronjobs.
See help (option -h) for details
Julian Maurice [Wed, 27 Jun 2012 10:27:31 +0000 (12:27 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9136' into dev/solr
Solved conflicts:
C4/AuthoritiesMarc.pm
Henri-Damien LAURENT [Wed, 27 Jun 2012 07:56:48 +0000 (09:56 +0200)]
sub merge refactoring using first_index when possible
This patch adds no features but intends to imporve readability.
It changes 9 lines for 1
Henri-Damien LAURENT [Wed, 27 Jun 2012 07:47:21 +0000 (09:47 +0200)]
MT9136 Fixing : restoring the first subfieldcode $a if it was changed
The change of subfielcode was permanent for all the other records
This patch restores the $a after a change
Jonathan Druart [Tue, 26 Jun 2012 10:07:14 +0000 (12:07 +0200)]
MT9656,MT8362: Move js code into a separated commmon file
Jonathan Druart [Mon, 25 Jun 2012 13:25:34 +0000 (15:25 +0200)]
MT9775: Prevent infinite loop on same lines
For an unknown reason, if the index record queue processes a bad formatted
line, we want to skip it and catch the error into the log file.
You can grep it with the "ERROR ON LINE" pattern
Julian Maurice [Mon, 25 Jun 2012 09:46:17 +0000 (11:46 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT8200' into dev/solr
Julian Maurice [Mon, 25 Jun 2012 09:44:08 +0000 (11:44 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9461' into dev/solr
Julian Maurice [Mon, 14 May 2012 14:37:22 +0000 (16:37 +0200)]
[SOLR] MT9461: Add --check option to dedup_authorities.pl
This option allow to tell the script which fields and subfields must be
checked to confirm that two authorities are duplicates.
See documentation for more details (perl dedup_authorities.pl -h)
This patch also modify the script so that all fields are checked and not
only the first.
Julian Maurice [Mon, 14 May 2012 14:44:19 +0000 (16:44 +0200)]
MT9461: dedup_authorities.pl: fix _choose_records
@candidate_authids are now sorted by usage descending (instead of
ascending) so that the first (kept) record is the one that is the most
used.
Julian Maurice [Mon, 7 May 2012 08:05:32 +0000 (10:05 +0200)]
MT9136: Fix merge function
Subfield code is changed only for $a
Jonathan Druart [Mon, 18 Jun 2012 11:40:24 +0000 (13:40 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9537' into dev/solr
Julian Maurice [Thu, 14 Jun 2012 10:23:59 +0000 (12:23 +0200)]
New script xt/find-undefined-subroutines.pl
Julian Maurice [Mon, 11 Jun 2012 14:41:50 +0000 (16:41 +0200)]
MT8884: Fix merge sub
Fix crash when Solr results contain id that are not anymore in database
Jonathan Druart [Tue, 29 May 2012 08:56:46 +0000 (10:56 +0200)]
MT9357: FIX Patrons statistics, if patron is inactive
If patrons are selected as inactive, we want to catch rows with a
borrowernumber = NULL
BibLibre [Tue, 28 Feb 2012 10:31:36 +0000 (11:31 +0100)]
MT9111: Porting edits for merge authorities
This work is a port of the authorities management
for the 'BNF Harveseter'
This makes composed UNIMARC authorities conformed to RAMEAU
Laurence Lefaucheur [Fri, 25 Nov 2011 14:41:10 +0000 (15:41 +0100)]
MT6920 missing new in default value
Julian Maurice [Thu, 24 May 2012 09:46:33 +0000 (11:46 +0200)]
MT8362: auth_finder.pl: do not copy $9 subfields
Jonathan Druart [Mon, 21 May 2012 12:38:32 +0000 (14:38 +0200)]
MT9537: Toggle "new" status: new_status_value become multivalued
Now you have to give several values for the new_status_value
Jonathan Druart [Mon, 21 May 2012 08:04:47 +0000 (10:04 +0200)]
MT9326: Followup: Displaying cn_source as Call number source
We want to display the description (from an authorised value)
Jonathan Druart [Wed, 16 May 2012 13:56:43 +0000 (15:56 +0200)]
MT9537: use the ccode only if defined in the yaml config file
+ new_status_value become a multivalued param in the yaml file
Matthias Meusburger [Wed, 18 May 2011 11:39:06 +0000 (13:39 +0200)]
MT4259: Toggle "New" Status
This is a combination of 5 commits.
MT4259: Toggle "New" status
Conflicts:
misc/cronjobs/toggle_new_status.yaml.orig
MT4259, Follow-up: Updated yaml.orig file (so comments are not mixed with values)
Conflicts:
misc/cronjobs/toggle_new_status.yaml.orig
MT4259, Follow-up: Uses items.new mapping
Conflicts:
etc/solr
kohaversion.pl
misc/cronjobs/toggle_new_status.yaml.orig
MT4259, Follow-up: Adds items.new mapping to AddItem
Conflicts:
etc/solr
MT4259 Follow-up: adds missing kohastructure.sql
Julian Maurice [Tue, 15 May 2012 08:05:59 +0000 (10:05 +0200)]
MT8200: advance_notices.pl: make use of -f parameter
Jonathan Druart [Thu, 3 Nov 2011 08:30:04 +0000 (09:30 +0100)]
MT8200: Cherry-pick of 3 commits from origin/stetienne/ft/MT8200
MT8200: FIX format for onloan field for advance notices
(cherry picked from commit
dc8c104a6324c4deb44c2cb7752e9be38463afe6)
MT8200: Fix C4::Letters::parseletter when date is 0000-00-00
(cherry picked from commit
fd299ff5c969a8a6fbcf54cb4fcfda92b6f3e11a)
MT8200: Check return of GetMessaginPreference in advance_notices.pl
(cherry picked from commit
31cc1fed067816c6fbeadf6bf310acd2a4647796)
Jonathan Druart [Wed, 9 May 2012 07:49:01 +0000 (09:49 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9342' into dev/solr
Julian Maurice [Mon, 7 May 2012 12:01:11 +0000 (14:01 +0200)]
MT9265: Fix overdue_notices.pl
If delay of 3rd notice was greater than $MAX (90), sql query handled by
$sth2 returned no results since 'BETWEEN a AND b' return no results if a
> b.
This was causing a letter to be printed with no items.
This is fixed by setting $maxdays=$mindays in this case.
Note: this issue can be avoided by using --max parameter
Jonathan Druart [Fri, 4 May 2012 12:20:45 +0000 (14:20 +0200)]
MT9525: Bug 3413: Checkboxes for new subfields not saving correctly
The bug was in the numbering of the fields and subfields in the form.
The form elements for the 'new subfield' got the same numbered names and
ids as
the form elements for the second subfield. (example: repeatable1)
The patch fixes the numbering to continue to the new subfield.
To test:
- Create some new subfields and check all checkbox fields save correctly
(mandatory, repeatable, is url)
- Check that other subfields' checkboxes are not changed
- Check existing subfields and newly created subfields can be edited
Signed-off-by: mveron <veron@veron.ch>
Jonathan Druart [Fri, 4 May 2012 07:36:21 +0000 (09:36 +0200)]
MT9161: Prevent FF warning on printing slip
Julian Maurice [Thu, 3 May 2012 12:34:30 +0000 (14:34 +0200)]
[SOLR] MT9444 Minor fixes for remove_unused_authorities.pl
- use Modern::Perl
- print usage and exit if --max-gap is negative
- exit 1 instead of exit -1
- recordtype:biblio in filters instead of query
Julian Maurice [Mon, 23 Apr 2012 14:24:44 +0000 (16:24 +0200)]
[SOLR] MT9444 remove_unused_authorities.pl improvements
- New parameter --max-gap (integer).
The script first count how many biblios are indexed and compare to the
number of biblio in database. If difference is greater than this
parameter, it warn and stops there (ie. do nothing).
- Progression information in percentage
- Print the list of deleted authorities each 100 processed authorities
(if any)
Julian Maurice [Thu, 3 May 2012 09:42:43 +0000 (11:42 +0200)]
MT8884: Fix merge to avoid dying when authority doesn't exist.
Jonathan Druart [Thu, 3 May 2012 10:11:23 +0000 (12:11 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9261' into dev/solr
Jonathan Druart [Thu, 3 May 2012 09:37:17 +0000 (11:37 +0200)]
Merge remote-tracking branch 'origin/solr/ft/logger' into dev/solr
Garry Collum [Wed, 1 Feb 2012 15:15:46 +0000 (10:15 -0500)]
Bug 6984 - Holds statistics doesn't work.
This patch fixes several errors in reserves_stats.pl and reserves_stats.tt.
Testing -
To test this patch, data must be in either the reserves table or old_reserves or both. The following SQL will give you the raw data that is used by the report.
SELECT priority, found, reservedate, notificationdate, reminderdate,
waitingdate, cancellationdate, borrowers.categorycode, items.itype,
reserves.branchcode, holdingbranch, items.homebranch, items.ccode,
items.location, items.itemcallnumber, borrowers.sort1, borrowers.sort2
FROM reserves
LEFT JOIN borrowers on (borrowers.borrowernumber = reserves.borrowernumber)
LEFT JOIN items on (items.itemnumber = reserves.itemnumber)
UNION SELECT priority, found, reservedate, notificationdate, reminderdate,
waitingdate, cancellationdate, borrowers.categorycode, items.itype,
old_reserves.branchcode, holdingbranch, items.homebranch, items.ccode,
items.location, items.itemcallnumber, borrowers.sort1, borrowers.sort2
FROM old_reserves
LEFT JOIN borrowers on (borrowers.borrowernumber = old_reserves.borrowernumber)
LEFT JOIN items on (items.itemnumber = old_reserves.itemnumber)
To test the notificationdate and reminderdate, I added data to the old_reserves table, since I have never run notices on my test machine.
Ex:
UPDATE old_reserves
SET notificationdate = "2012-01-29",
reminderdate = "2012-01-29"
WHERE timestamp = "2012-01-29 20:09:34";
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm original bug -- Reports work as expected now!
prove t xt t/db_dependent no different from master.
Jonathan Druart [Wed, 2 May 2012 07:30:34 +0000 (09:30 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT7481' into dev/solr
Conflicts solved:
C4/Record.pm
tools/export.pl
Jonathan Druart [Mon, 30 Apr 2012 09:44:08 +0000 (11:44 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9184' into dev/solr
Julian Maurice [Thu, 26 Apr 2012 08:20:16 +0000 (10:20 +0200)]
MT9136: Don't check for tagfield in _process_subfcode_4_merge
It isn't necessary since sub merge call it only with tags related to an
authority type. (merge is the only sub that uses
_process_subfcode_4_merge)
Jonathan Druart [Wed, 25 Apr 2012 15:13:00 +0000 (17:13 +0200)]
[SOLR][LOGGER] FIX warnings when no file argument
Julian Maurice [Wed, 25 Apr 2012 11:17:17 +0000 (13:17 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9055' into dev/solr
Julian Maurice [Tue, 24 Apr 2012 13:39:37 +0000 (15:39 +0200)]
Merge remote-tracking branch 'origin/solr/ft/rpn2solr' into dev/solr
Matthias Meusburger [Thu, 8 Dec 2011 14:22:32 +0000 (15:22 +0100)]
MT7481 - MT8298 : Adds a CLI option to tools/export.pl to remove NSE/NSB characters from exported records
(cherry picked from commit
e3c3c672ddc40fece824f9451f3b5d0c87f359d1)
Conflicts solved:
tools/export.pl
Matthias Meusburger [Tue, 23 Aug 2011 15:25:15 +0000 (17:25 +0200)]
MT7481: Adds tools/export_borrowers.pl
- This script allows to export borrowers in a simple way (pipe-separated fields).
Fields to export can be supplied in command-line parameters.
(cherry picked from commit
fabce2a24fa7fa085e2f133de84f1919e44fea33)
Jonathan Druart [Fri, 20 Apr 2012 14:36:09 +0000 (16:36 +0200)]
[SOLR]RPN2Solr: Set timeout on general rule
Julian Maurice [Wed, 18 Apr 2012 07:13:58 +0000 (09:13 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9380' into dev/solr
Jonathan Druart [Mon, 16 Apr 2012 14:08:15 +0000 (16:08 +0200)]
Merge remote-tracking branch 'origin/solr/bug/MIN/MT8409' into dev/solr
Conflicts solved:
C4/Serials.pm
Jonathan Druart [Mon, 16 Apr 2012 13:58:26 +0000 (15:58 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9388' into dev/solr