Claire Hernandez [Wed, 7 Dec 2011 10:17:04 +0000 (11:17 +0100)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
Conflicts solved:
installer/data/mysql/en/mandatory/sysprefs.sql
installer/data/mysql/updatedatabase.pl
Jonathan Druart [Wed, 7 Dec 2011 09:25:45 +0000 (10:25 +0100)]
Merge remote-tracking branch 'origin/unilim/ft/MT6844' into dev/unilim
Julian Maurice [Wed, 7 Dec 2011 08:32:34 +0000 (09:32 +0100)]
Fix merge MT6927
Julian Maurice [Wed, 7 Dec 2011 08:32:02 +0000 (09:32 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT8086' into dev/stetienne
Julian Maurice [Wed, 7 Dec 2011 08:31:07 +0000 (09:31 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT6927' into dev/stetienne
Solved conflicts:
C4/Circulation.pm
C4/Reserves.pm
circ/circulation.pl
circ/returns.pl
circ/waitingreserves.pl
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/opac-tmpl/prog/en/modules/opac-reserve.tmpl
kohaversion.pl
opac/opac-reserve.pl
reserve/renewscript.pl
Matthias Meusburger [Mon, 20 Jun 2011 15:07:37 +0000 (17:07 +0200)]
MT6927: Adds the ability to reserve the next available item at a given branch.
Squash :
MT6927: Adds the ability to reserve the next available item at a given branch.
Also adds the ability the reserve the next avaiable item in any branch, but without transfer.
MT6927: Adds the ability to reserve the next available item at a given branch
MT6927, Follow-up: forgot kohaversion.pl
MT6927: Fix column name in updatedatabase
MT6927: Remove forgotten console.log
MT6927: Fix hold for a given library, Fix UI
MT6927: Fix hold for any library
MT6927: Removes unuseful warns
MT6927: Fix UI (branch dropdown list was disabled on change)
MT6927: Fix use of GetItem in C4::Reserves
MT6927: Holding a specific copy also disable pick-up location
MT6927: Fix transfer on empty branch
MT6927: Prevent user from forcing return when transfer is not allowed
due to branch transfer limits
MT6927: Fix template when OpacItemHolds is OFF
MT6927: Do not show "Next available copy" when OPACHoldNextInLibrary in ON
MT6927: Fix Pickuplocation
MT6927: Handle branch transfer limits when OPACHoldNextInLibrary is ON
MT6927: Adds the ability to reserve the next available item at a given branch.
- Adds this feature to Intranet, based on StaffHoldNextInLibrary syspref
MT6927: Adds the ability to reserve the next available item at a given branch
- Prevent pickup library to be modified after reservation in intranet
- Restrict library selection to the libraries where at least one item is available
MT6927: Adds the ability to reserve the next available item at a given branch
- Merge OPACHoldNextInLibrary and StaffHoldNextInLibrary sysprefs into one single HoldNextInLibrary syspref
MT6927: Adds the ability to reserve the next available item at a given branch
- UI Fix : make the dropdown lists values match when the page is loaded,
not only when there is a change
Julian Maurice [Wed, 7 Dec 2011 08:15:46 +0000 (09:15 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT8200' into dev/stetienne
Julian Maurice [Mon, 5 Dec 2011 11:40:47 +0000 (12:40 +0100)]
MT8200: Check return of GetMessaginPreference in advance_notices.pl
Julian Maurice [Tue, 6 Dec 2011 16:16:45 +0000 (17:16 +0100)]
MT8086: Use templates for CSV export (basket and basketgroup)
Claire Hernandez [Tue, 6 Dec 2011 09:38:32 +0000 (10:38 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Alex Arnaud [Fri, 2 Dec 2011 08:37:06 +0000 (09:37 +0100)]
MT8450 - AuthenticatePatron doesn't work
(cherry picked from commit
f210b4471b3f9d745edd60d4b43c5fee91bb08f5)
Claire Hernandez [Wed, 30 Nov 2011 10:38:32 +0000 (11:38 +0100)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
Julian Maurice [Tue, 29 Nov 2011 15:52:14 +0000 (16:52 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT8339' into dev/stetienne
Julian Maurice [Tue, 29 Nov 2011 14:44:40 +0000 (15:44 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT8103' into dev/stetienne
Julian Maurice [Fri, 21 Oct 2011 13:33:02 +0000 (15:33 +0200)]
MT8103: Prevent 'Return' key to submit the form
Pages: orderreceive.pl
neworderempty.pl
Julian Maurice [Tue, 29 Nov 2011 12:42:06 +0000 (13:42 +0100)]
MT8339: Use Text::CSV::Unicode in GetBasketGroupAsCSV
Text::CSV::Encoded doesn't support wide characters
Claire Hernandez [Tue, 29 Nov 2011 10:24:23 +0000 (11:24 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Julian Maurice [Fri, 25 Nov 2011 12:41:18 +0000 (13:41 +0100)]
MT8362: auth_finder.pl: improve multiple subfields management
Before this patch, choosing an authority which have multiple subfields
with the same tag, values were joined in a single subfield, seperating
values with a pipe ('|').
Now, if an authority has for example two $x subfields, there will be two
$x subfields in the biblio too. The exception is when the subfield is
not repeatable in the biblio marc framework. In this case, only the
first subfield is copied.
Julian Maurice [Thu, 24 Nov 2011 13:56:14 +0000 (14:56 +0100)]
MT8249: Display multiple subfields in authority summary
Jonathan Druart [Mon, 28 Nov 2011 15:51:31 +0000 (16:51 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT8362' into dev/stetienne
Jonathan Druart [Mon, 28 Nov 2011 15:42:00 +0000 (16:42 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT7654' into dev/solr
Conflicts solved:
C4/AuthoritiesMarc.pm
Jonathan Druart [Mon, 28 Nov 2011 15:21:32 +0000 (16:21 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT7464' into dev/solr
Jonathan Druart [Mon, 28 Nov 2011 14:13:16 +0000 (15:13 +0100)]
MT6844: 1 checkbox per line with same functionality
Julian Maurice [Fri, 25 Nov 2011 12:41:18 +0000 (13:41 +0100)]
MT8362: auth_finder.pl: improve multiple subfields management
Before this patch, choosing an authority which have multiple subfields
with the same tag, values were joined in a single subfield, seperating
values with a pipe ('|').
Now, if an authority has for example two $x subfields, there will be two
$x subfields in the biblio too. The exception is when the subfield is
not repeatable in the biblio marc framework. In this case, only the
first subfield is copied.
Julian Maurice [Thu, 24 Nov 2011 13:56:14 +0000 (14:56 +0100)]
MT8249: Display multiple subfields in authority summary
Julian Maurice [Wed, 23 Nov 2011 10:18:03 +0000 (11:18 +0100)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
Julian Maurice [Wed, 23 Nov 2011 08:31:27 +0000 (09:31 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Julian Maurice [Wed, 23 Nov 2011 08:20:58 +0000 (09:20 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT7508' into dev/solr
Claire Hernandez [Tue, 22 Nov 2011 10:40:44 +0000 (11:40 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Claire Hernandez [Tue, 22 Nov 2011 10:34:51 +0000 (11:34 +0100)]
Simple review of about.pl script for Solr Usages
Jonathan Druart [Mon, 21 Nov 2011 14:46:32 +0000 (15:46 +0100)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
Jonathan Druart [Mon, 21 Nov 2011 14:41:50 +0000 (15:41 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Jonathan Druart [Mon, 21 Nov 2011 14:40:12 +0000 (15:40 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8285' into dev/solr
Jonathan Druart [Mon, 21 Nov 2011 14:40:06 +0000 (15:40 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8333' into dev/solr
Jonathan Druart [Mon, 21 Nov 2011 14:39:56 +0000 (15:39 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8090' into dev/solr
Jonathan Druart [Mon, 21 Nov 2011 14:19:31 +0000 (15:19 +0100)]
Merge remote-tracking branch 'origin/unilim/ft/MT6845' into dev/unilim
Conflicts solved:
kohaversion.pl
Jonathan Druart [Mon, 21 Nov 2011 14:17:39 +0000 (15:17 +0100)]
Merge remote-tracking branch 'origin/unilim/ft/MT6843' into dev/unilim
Jonathan Druart [Mon, 21 Nov 2011 14:04:00 +0000 (15:04 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT8200' into dev/stetienne
Jonathan Druart [Mon, 21 Nov 2011 13:53:15 +0000 (14:53 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT7611' into dev/stetienne
Jonathan Druart [Mon, 21 Nov 2011 13:50:35 +0000 (14:50 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT6533' into dev/stetienne
Jonathan Druart [Mon, 21 Nov 2011 13:45:48 +0000 (14:45 +0100)]
Merge remote-tracking branch 'origin/dev/stetienne' into MT5836
Jonathan Druart [Fri, 18 Nov 2011 14:35:54 +0000 (15:35 +0100)]
FIX IndexRecordQueue when deleting recordids in file
All recordids in file wich have been indexed must be deleted correctly
Jonathan Druart [Thu, 17 Nov 2011 15:24:36 +0000 (16:24 +0100)]
[SOLR] FIX Calls to ModItem for issues and returns
Julian Maurice [Thu, 17 Nov 2011 14:38:23 +0000 (15:38 +0100)]
MT7508: BiblioAddAuthorities: Don't skip field if it has a subfield '3'
Jonathan Druart [Wed, 16 Nov 2011 10:11:11 +0000 (11:11 +0100)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
Conflicts solved:
C4/Search.pm
misc/translator/po/fr-FR-i-staff-t-prog-v-
3002000.po
Jonathan Druart [Wed, 16 Nov 2011 09:47:20 +0000 (10:47 +0100)]
[SOLR] FIX availability index name (opac + pro)
Julian Maurice [Tue, 15 Nov 2011 16:12:40 +0000 (17:12 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Julian Maurice [Tue, 15 Nov 2011 13:17:33 +0000 (14:17 +0100)]
MT6843: Set listprice in addorderiso2709.pl
+ Swap rrp and ecost values (rrp is the vendor price, ecost is the
discounted price)
Julian Maurice [Tue, 15 Nov 2011 11:06:05 +0000 (12:06 +0100)]
MT5836/MT6843: Don't set uncertainprice tmpl_var when it's set for
cancelled orders
Jonathan Druart [Mon, 14 Nov 2011 14:33:57 +0000 (15:33 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8268' into dev/solr
Jonathan Druart [Mon, 14 Nov 2011 14:32:43 +0000 (15:32 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8237' into dev/solr
Conflicts solved:
C4/Search.pm
Julian Maurice [Mon, 14 Nov 2011 10:14:39 +0000 (11:14 +0100)]
MT6533: Fix GetInvoice
Retrieve invoice informations even if the row in table invoices does not
exist
Jonathan Druart [Mon, 14 Nov 2011 09:27:55 +0000 (10:27 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Jonathan Druart [Mon, 14 Nov 2011 09:27:31 +0000 (10:27 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT7563' into dev/solr
Jonathan Druart [Mon, 14 Nov 2011 09:20:10 +0000 (10:20 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT7603' into dev/stetienne
Jonathan Druart [Mon, 14 Nov 2011 09:18:37 +0000 (10:18 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT7916' into dev/stetienne
Jonathan Druart [Mon, 14 Nov 2011 09:17:22 +0000 (10:17 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT8092' into dev/stetienne
Julian Maurice [Mon, 14 Nov 2011 09:10:23 +0000 (10:10 +0100)]
MT8200: Fix C4::Letters::parseletter when date is 0000-00-00
Jonathan Druart [Mon, 14 Nov 2011 09:10:16 +0000 (10:10 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT8103' into dev/stetienne
Jonathan Druart [Mon, 14 Nov 2011 09:09:21 +0000 (10:09 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT6523' 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
99bf2da49ed0fb93099ab9d2b4bcbd2ba4ac7c41)
Jonathan Druart [Thu, 10 Nov 2011 11:33:29 +0000 (12:33 +0100)]
FIX Path to XSLT
Henri-Damien LAURENT [Wed, 9 Nov 2011 17:19:41 +0000 (18:19 +0100)]
[Solr] [SUDOC] deduping authorities script
This patch adds a script to dedup authorities
Usage :
perl dedup_authorities.pl AUTHTYPECODE1 AUTHTYPECODE2 --where "authid>XX"
if one wants to run deduping on all authorities types, then option --all can be used.
Henri-Damien LAURENT [Wed, 9 Nov 2011 17:17:19 +0000 (18:17 +0100)]
MT7337: merge_authority improvements
only delete authority if something is merged
Donot get authority multiple times
manage stored authorities in files rather than relying only on the authority record
Henri-Damien LAURENT [Wed, 9 Nov 2011 17:15:40 +0000 (18:15 +0100)]
MT6049: UNIMARC C4::Charset.pm useless change leader(9) (cherry-oicked on dev/solr)
Koha changes the leader position 9 when it loads a biblio
this patch changes the SetUnicodeEncodingFlag
Henri-Damien LAURENT [Wed, 30 Mar 2011 16:03:30 +0000 (18:03 +0200)]
MT7654 Merge authorities when repeated (dedup script)
Squashed commits
----------------
AuthoritiesMarc merge fix. + reindenting.
If $9 was at the end of the biblio record,
the authority information were not deleted
Now it is the case
Debug merge in C4/Authorities.pm for solr
Merge authorities : widening the synched fields on biblios
search was restricted to fields related to the authority code remote.
It is now looking into all the tags linked to any authoriy rather than looking only
to the tag linked to this authtypecode.
Adding support for multiple composed authorities
With field 606 in UNIMARC when composed authorities, you need to change
the subfield from the authority to insert them into subfields of the
biblio.
This process adds that function.
It changes the subfieldcode from $a to $y if biblio tag is 606 and authtypecode is linked to 215.
It changes the subfieldcode from $a to $z if biblio tag is 606 and authtority contains "chronologique".
Using Storable to store and retrieve the authority
Stores the old authority in the file generated when updating an authority.
This file will be read and used in merge_authority.pl
MT7337 followup : adding auth_tag_to_report
AuthoritiesMarc. merge :$3 were munged.
$3 when merging authorities into biblio records were munged.
This was therefore introducing a problem with vendangeur
Adding more tags for subf processing (required for SUDOC)
namely :
607
700
701
702
710
711
712
Remove NoZebra (cherry-oicked on dev/solr)
MT7654 MT7337 Followup Authorities Solr deduplication QA Management edits
Followup to take into account some remarks from J Druart
Deleted record were not properly managed
Taking into account QA remarks
IndexRecordSignature conformance
Solr Search on int_authid:'123' doesnot find any biblio
where int_authid:123 find the biblios
Jonathan Druart [Thu, 3 Nov 2011 12:54:17 +0000 (13:54 +0100)]
MT7611: on "place hold", check if borrower are currently checked out it
Julian Maurice [Wed, 9 Nov 2011 16:00:56 +0000 (17:00 +0100)]
MT6845: Order cancellation
Remove useless code for building referrer
Julian Maurice [Wed, 9 Nov 2011 15:30:35 +0000 (16:30 +0100)]
MT7603: Change order notes
Remove useless code for building referrer url
Jonathan Druart [Mon, 31 Oct 2011 09:13:53 +0000 (10:13 +0100)]
MT7563/MT8213: FIX DT Traduction for table claims in serial module
Jonathan Druart [Mon, 7 Nov 2011 16:00:56 +0000 (17:00 +0100)]
MT6523: Add separation between + and Clear buttons
Jonathan Druart [Mon, 7 Nov 2011 14:11:20 +0000 (15:11 +0100)]
MT8238: Add DataTables on authorised_values
Claire Hernandez [Wed, 9 Nov 2011 09:10:10 +0000 (10:10 +0100)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
Conflicts solved:
installer/data/mysql/kohastructure.sql
installer/data/mysql/updatedatabase.pl
kohaversion.pl
Julian Maurice [Wed, 9 Nov 2011 08:28:16 +0000 (09:28 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Solved conflicts:
installer/data/mysql/updatedatabase.pl
kohaversion.pl
Christophe Croullebois [Tue, 11 Oct 2011 15:21:26 +0000 (17:21 +0200)]
(MT #8093) See bug_6970 I have just tranlated it for 3.2
FF7 when logout don't close and let a white page.
(cherry picked from commit
9567ea18dc02272f1d66db9d93c97cb5e2c4bd11)
Jonathan Druart [Mon, 7 Nov 2011 13:33:32 +0000 (14:33 +0100)]
MT7603: Change order notes on basket.pl
Jonathan Druart [Mon, 7 Nov 2011 11:33:42 +0000 (12:33 +0100)]
Merge remote branch 'origin/solr/ft/MT5676' into dev/solr_new
Conflicts solved:
t/solr/search.t
Jonathan Druart [Mon, 7 Nov 2011 11:32:39 +0000 (12:32 +0100)]
Merge remote branch 'origin/solr/ft/MT7142' into dev/solr_new
Jonathan Druart [Fri, 14 Oct 2011 14:10:32 +0000 (16:10 +0200)]
FIX colons in query.
If query contains colons into quotes, we escape it
Julian Maurice [Mon, 7 Nov 2011 09:34:33 +0000 (10:34 +0100)]
MT6842: Show working branch suggestions by default
Jonathan Druart [Thu, 3 Nov 2011 15:51:54 +0000 (16:51 +0100)]
[SOLR] Followup: FIX AddAuthority in biblio
Construct corectly the solr query
Jonathan Druart [Thu, 3 Nov 2011 14:25:20 +0000 (15:25 +0100)]
[SOLR][FACETS] str_* index must contains all original values, not only one
Jonathan Druart [Wed, 26 Oct 2011 10:18:37 +0000 (12:18 +0200)]
MT7806: Hide link export mods if marcflavour ne MARC21
XSLT for export mods don't exist
Jonathan Druart [Wed, 28 Sep 2011 15:25:27 +0000 (17:25 +0200)]
MT7806: FIX export Ris.pm
- global var $intype
- no truncate isbn and issn
Claire Hernandez [Thu, 3 Nov 2011 13:00:16 +0000 (14:00 +0100)]
Remove NoZebra
Conflicts solved:
C4/AuthoritiesMarc.pm
Henri-Damien LAURENT [Thu, 30 Jun 2011 13:49:34 +0000 (15:49 +0200)]
MT6049: UNIMARC C4::Charset.pm useless change leader(9)
Koha changes the leader position 9 when it loads a biblio
this patch changes the SetUnicodeEncodingFlag
(cherry picked from commit
4d8008d0f38175a4259dee9db1161765970dd8dc)
Jonathan Druart [Thu, 3 Nov 2011 09:44:15 +0000 (10:44 +0100)]
MT8103: Followup: Prevent 'Return' key to submit the form
Jonathan Druart [Thu, 3 Nov 2011 08:30:04 +0000 (09:30 +0100)]
MT8200: FIX format for onloan field for advance notices
Jonathan Druart [Wed, 2 Nov 2011 15:35:14 +0000 (16:35 +0100)]
[SOLR] MT7325-MT7355: FIX force facets order with order by
in few cases, select from indexes returns results with id desc (why ??)
Jonathan Druart [Wed, 2 Nov 2011 11:56:31 +0000 (12:56 +0100)]
FIX OPACBaseUrl syspref
OPACBaseURL can contains protocol http or https
Claire Hernandez [Wed, 2 Nov 2011 10:29:31 +0000 (11:29 +0100)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
Jonathan Druart [Wed, 2 Nov 2011 09:04:16 +0000 (10:04 +0100)]
MT8068: Add missing field borrower.lostcomment in kohastructure
Jonathan Druart [Fri, 28 Oct 2011 09:37:53 +0000 (11:37 +0200)]
Merge remote branch 'origin/dev/solr' into dev/stetienne
Jonathan Druart [Fri, 28 Oct 2011 09:36:39 +0000 (11:36 +0200)]
MT8177: FIX syspref numSearchResults in intranet
Jonathan Druart [Thu, 27 Oct 2011 15:04:58 +0000 (17:04 +0200)]
Merge remote branch 'origin/dev/solr' into dev/stetienne
Claire Hernandez [Tue, 5 Jul 2011 15:16:05 +0000 (17:16 +0200)]
[SOLR] MT8173 - UsedInXBiblio is not updated
(cherry picked from commit
629e5bc8c97f06929dbb4932629b52aaf1f8f716)
Jonathan Druart [Thu, 27 Oct 2011 14:07:27 +0000 (16:07 +0200)]
Merge remote branch 'origin/stetienne/ft/MT8209' into dev/stetienne
Jonathan Druart [Thu, 27 Oct 2011 14:06:39 +0000 (16:06 +0200)]
Merge remote branch 'origin/stetienne/ft/MT7998' into dev/stetienne
Jonathan Druart [Thu, 27 Oct 2011 14:06:09 +0000 (16:06 +0200)]
Merge remote branch 'origin/solr/ft/check_updatedatabase' into dev/stetienne
Jonathan Druart [Thu, 27 Oct 2011 13:57:21 +0000 (15:57 +0200)]
MT7916: Add deleted code for budgets toolbar buttons