Fridolyn SOMERS [Fri, 28 Jun 2013 14:18:01 +0000 (16:18 +0200)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
Conflicts:
acqui/addorderiso2709.pl
acqui/histsearch.pl
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
misc/translator/po/fr-FR-MT11523-staff.po
Fridolyn SOMERS [Fri, 28 Jun 2013 13:43:58 +0000 (15:43 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Conflicts:
acqui/addorderiso2709.pl
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
Fridolyn SOMERS [Fri, 28 Jun 2013 12:56:29 +0000 (14:56 +0200)]
Merge remote-tracking branch 'origin/stetienne/bug/MT11523' into dev/stetienne
Fridolyn SOMERS [Fri, 28 Jun 2013 12:53:58 +0000 (14:53 +0200)]
Merge remote-tracking branch 'origin/stetienne/bug/MT11239' into dev/stetienne
Fridolyn SOMERS [Fri, 28 Jun 2013 12:41:06 +0000 (14:41 +0200)]
Merge remote-tracking branch 'origin/solr/bug/MT11523' into dev/solr
Fridolyn SOMERS [Fri, 28 Jun 2013 12:39:00 +0000 (14:39 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT11012' into dev/solr
Fridolyn SOMERS [Fri, 28 Jun 2013 12:36:21 +0000 (14:36 +0200)]
Merge remote-tracking branch 'origin/solr/bug/MT11048' into dev/solr
Fridolyn SOMERS [Fri, 28 Jun 2013 12:32:52 +0000 (14:32 +0200)]
Merge remote-tracking branch 'origin/solr/bug/MT11434' into dev/solr
Jonathan Druart [Thu, 29 Nov 2012 13:59:08 +0000 (14:59 +0100)]
MT10554: Get diff from comm for the check_parent_total script
Fridolyn SOMERS [Wed, 21 Nov 2012 15:23:06 +0000 (16:23 +0100)]
MT10487: BZ5009 autocomplete off for barcodes
Fridolyn SOMERS [Mon, 8 Oct 2012 08:39:51 +0000 (10:39 +0200)]
MT10260: Software error in opac-topissues.pl when not logged in
Fridolyn SOMERS [Fri, 28 Jun 2013 12:24:58 +0000 (14:24 +0200)]
Merge remote-tracking branch 'origin/solr/bug/MT11066' into dev/solr
Fridolyn SOMERS [Wed, 16 Jan 2013 11:17:53 +0000 (12:17 +0100)]
MT10844: remove phr in links of MARCdetail page
Fridolyn SOMERS [Wed, 26 Jun 2013 14:53:46 +0000 (16:53 +0200)]
[SOLR] Indexation: Allow --from and --to for autorities
Fridolyn SOMERS [Wed, 20 Feb 2013 16:19:48 +0000 (17:19 +0100)]
MT11048: branch filter in budgets admin uses pattern match instead of equals
Jonathan Druart [Wed, 19 Jun 2013 08:20:20 +0000 (10:20 +0200)]
Merge remote-tracking branch 'origin/stetienne/ft/MT10700' into dev/stetienne
Julian Maurice [Tue, 11 Jun 2013 11:19:40 +0000 (13:19 +0200)]
MT10700: CanBookBeReserved should return 0 only if the pref is "Allow" and the status is waiting
Fridolyn SOMERS [Wed, 5 Jun 2013 08:27:58 +0000 (10:27 +0200)]
Merge remote-tracking branch 'origin/stetienne/bug/MT10880' into dev/stetienne
Fridolyn SOMERS [Tue, 4 Jun 2013 08:46:14 +0000 (10:46 +0200)]
MT11970 : no shelfbrowser if item has no callnumber
Fridolyn SOMERS [Wed, 29 May 2013 14:31:25 +0000 (16:31 +0200)]
Merge remote-tracking branch 'origin/stetienne/bug/MT10519' into dev/stetienne
Fridolyn SOMERS [Wed, 29 May 2013 12:26:49 +0000 (14:26 +0200)]
MT11523 : translation
Fridolyn SOMERS [Wed, 29 May 2013 12:26:49 +0000 (14:26 +0200)]
MT11523 : translation
Fridolyn SOMERS [Wed, 29 May 2013 12:26:49 +0000 (14:26 +0200)]
MT11523 : translation
Fridolyn SOMERS [Tue, 9 Apr 2013 14:54:23 +0000 (16:54 +0200)]
MT11523 : use JS toggle in filters by active budget
Fridolyn SOMERS [Tue, 9 Apr 2013 14:53:35 +0000 (16:53 +0200)]
MT11523 : add a filter by active budget on addorderiso2709
See MT4717
Fridolyn SOMERS [Tue, 21 May 2013 13:54:51 +0000 (15:54 +0200)]
translation : correct broken HTML
Fridolyn SOMERS [Tue, 21 May 2013 13:50:27 +0000 (15:50 +0200)]
translation : remove BOM from files
Fridolyn SOMERS [Tue, 28 May 2013 09:31:02 +0000 (11:31 +0200)]
Merge remote-tracking branch 'origin/stetienne/bug/MT11240' into dev/stetienne
Julian Maurice [Thu, 23 May 2013 12:57:22 +0000 (12:57 +0000)]
Merge remote branch 'koha_biblibre/solr/ft/MT9198' into dev/solr
Jonathan Druart [Tue, 21 May 2013 13:37:34 +0000 (15:37 +0200)]
Merge remote-tracking branch 'origin/stetienne/ft/MT9843' into dev/stetienne
Fridolyn SOMERS [Mon, 20 May 2013 16:14:42 +0000 (18:14 +0200)]
MT11240 : other translation for borrower names
Fridolyn SOMERS [Mon, 20 May 2013 15:41:04 +0000 (17:41 +0200)]
MT10880 : Correct translation
Fridolyn SOMERS [Mon, 18 Jul 2011 10:15:09 +0000 (12:15 +0200)]
MT10777: suggestions are displayed 4 times
Suggestions are displayed once per status in patron page.
Based on bilibre master
a0d15ad1d8bbcd6c65ba816d17003af641f84cd9
Fridolyn SOMERS [Mon, 20 May 2013 14:18:46 +0000 (16:18 +0200)]
Merge remote-tracking branch 'origin/solr/bug/MT10777' into dev/solr
Jonathan Druart [Fri, 3 May 2013 13:09:55 +0000 (15:09 +0200)]
Merge remote-tracking branch 'origin/stetienne/ft/MT9697' into dev/stetienne
Jonathan Druart [Thu, 2 May 2013 08:23:38 +0000 (10:23 +0200)]
MT9843: Followup Update layout3pagesfr
FIX the package name
Jonathan Druart [Mon, 29 Apr 2013 15:30:19 +0000 (17:30 +0200)]
MT9697: FIX Datatables options. Use the default configuration
Fridolyn SOMERS [Tue, 9 Apr 2013 14:54:23 +0000 (16:54 +0200)]
MT11523 : use JS toggle in filters by active budget
Fridolyn SOMERS [Tue, 9 Apr 2013 14:53:35 +0000 (16:53 +0200)]
MT11523 : add a filter by active budget on addorderiso2709
See MT4717
Fridolyn SOMERS [Tue, 9 Apr 2013 14:54:23 +0000 (16:54 +0200)]
MT11523 : use JS toggle in filters by active budget
Fridolyn SOMERS [Tue, 9 Apr 2013 14:53:35 +0000 (16:53 +0200)]
MT11523 : add a filter by active budget on addorderiso2709
See MT4717
Jonathan Druart [Wed, 24 Apr 2013 07:55:21 +0000 (09:55 +0200)]
Merge remote-tracking branch 'origin/stetienne/ft/MT10546' into dev/stetienne
Jonathan Druart [Mon, 22 Apr 2013 09:32:54 +0000 (11:32 +0200)]
MT9843: Update layout3pagesfr
Jonathan Druart [Mon, 22 Apr 2013 08:58:01 +0000 (10:58 +0200)]
MT9697: Translation
Jonathan Druart [Wed, 17 Apr 2013 07:27:42 +0000 (09:27 +0200)]
MT9697: Add DataTables on the inventory table
Fridolyn SOMERS [Wed, 17 Apr 2013 11:20:31 +0000 (13:20 +0200)]
MT11239 : wrong input name for opac reserve on next available branch
Jonathan Druart [Tue, 16 Apr 2013 15:07:40 +0000 (17:07 +0200)]
MT9697: Manage item-level_itypes syspref
Jonathan Druart [Tue, 16 Apr 2013 12:07:10 +0000 (14:07 +0200)]
MT10546: Translation
Jonathan Druart [Tue, 16 Apr 2013 09:37:20 +0000 (11:37 +0200)]
Merge remote-tracking branch 'origin/stetienne/ft/MT10700' into dev/stetienne
Fridolyn SOMERS [Thu, 4 Apr 2013 15:28:57 +0000 (17:28 +0200)]
Merge dev/stetienne into dev/unilim
Fridolyn SOMERS [Thu, 4 Apr 2013 14:59:25 +0000 (16:59 +0200)]
Merge dev/solr into dev/stetienne
Fridolyn SOMERS [Thu, 4 Apr 2013 14:34:09 +0000 (16:34 +0200)]
Merge remote-tracking branch 'origin/solr/MIN/MT10986' into dev/solr
Fridolyn SOMERS [Thu, 4 Apr 2013 14:33:28 +0000 (16:33 +0200)]
Merge remote-tracking branch 'origin/solr/bug/MT11067' into dev/solr
Fridolyn SOMERS [Thu, 4 Apr 2013 14:32:45 +0000 (16:32 +0200)]
Merge remote-tracking branch 'origin/solr/bug/MT8968' into dev/solr
Adrien Saurat [Tue, 5 Mar 2013 10:06:07 +0000 (11:06 +0100)]
MT11194 : fines, notes now stored for 'write off' operations
The note field was not filled in every case, left empty for
'write off' payments.
Adrien Saurat [Thu, 13 Dec 2012 16:15:24 +0000 (17:15 +0100)]
MT10350: adds itemcallnumber to waiting holds
On the patron page, the waiting holds list now
displays the itemcallnumber after the author name.
Fridolyn SOMERS [Thu, 4 Apr 2013 14:28:03 +0000 (16:28 +0200)]
Merge remote-tracking branch 'origin/solr/bug/MIN/MT10351' into dev/solr
Fridolyn SOMERS [Thu, 28 Mar 2013 13:10:46 +0000 (14:10 +0100)]
MT11434 : correct opac-topissues filters
Julian Maurice [Tue, 3 Jul 2012 12:47:50 +0000 (14:47 +0200)]
MT8968: Fix CanItemBeReserved
Check if a borrower has already reserved an item.
Fix ILS-DI services HoldTitle and HoldItem :
- Calculate reserve rank
- Pass parameters to AddReserve in the right orders (two parameters were
missing)
Koha Team St-Étienne [Thu, 3 Jan 2013 14:48:22 +0000 (15:48 +0100)]
MT10356: search on ppn to find duplicate
Jonathan Druart [Fri, 8 Mar 2013 15:45:30 +0000 (16:45 +0100)]
MT10700: Allow hold on waiting items.
This patch a new syspref: AllowHoldOnWaitingItems
If enabled, it allows a user to place a hold on waiting items.
Fridolyn SOMERS [Thu, 7 Mar 2013 10:13:39 +0000 (11:13 +0100)]
MT11236: Deleting a subfield deletes entire field in authority editor
Jonathan Druart [Tue, 26 Feb 2013 08:58:41 +0000 (09:58 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT11012' into dev/solr
Fridolyn SOMERS [Fri, 22 Feb 2013 10:04:25 +0000 (11:04 +0100)]
MT10519 : remove serial status 5 = not available
Fridolyn SOMERS [Thu, 21 Feb 2013 15:55:36 +0000 (16:55 +0100)]
MT11066 : force date sort order in readingrec
Jonathan Druart [Thu, 21 Feb 2013 10:01:37 +0000 (11:01 +0100)]
Improve error message when translation installation fails
For Translator Manager (myself...). A translation installation may fail because
translator hasn't enter properly string parameters (%s). With this patch, the
message ID is displayed not only the parameter.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fridolyn SOMERS [Wed, 20 Feb 2013 15:49:23 +0000 (16:49 +0100)]
MT11067 : add sort order on budgets combobox
Fridolyn SOMERS [Mon, 18 Jul 2011 10:15:09 +0000 (12:15 +0200)]
MT10777: suggestions are displayed 4 times
Suggestions are displayed once per status in patron page.
Based on bilibre master
a0d15ad1d8bbcd6c65ba816d17003af641f84cd9
Fridolyn SOMERS [Fri, 15 Feb 2013 10:33:00 +0000 (11:33 +0100)]
MT10986 : format debarred end date in return page
Jonathan Druart [Thu, 14 Feb 2013 11:23:11 +0000 (12:23 +0100)]
MT9697: Add a itemtype filter for inventory
This patch adds a item types list on the inventory tool page.
The list of generated items will be a list of items with on of the item
types selected. On this way a user can filter the items by itemtypes.
Jonathan Druart [Thu, 14 Feb 2013 10:40:29 +0000 (11:40 +0100)]
MT10546: Add the status on the orders result table
This patch adds a new column 'status' on the histsearch page.
A message is displayed if the search returns no result.
Jonathan Druart [Mon, 11 Feb 2013 14:47:14 +0000 (15:47 +0100)]
MT9843: Display each gst rate on the page 2
Jonathan Druart [Mon, 11 Feb 2013 10:40:43 +0000 (11:40 +0100)]
[SOLR] Indexation: Add --from and --to parameters
Allow to call rebuild_solr with --from and/or --to parameters
Jonathan Druart [Mon, 4 Feb 2013 16:33:20 +0000 (17:33 +0100)]
[SOLR] FIX the output for the solr indexation
When C4::Search::Engine::Solr::IndexRecord is called from the
rebuild_solr.pl script we want to display the output for the indexing and
building time.
Before this patch, the building time was never shown at the first pass
and both times were never shown for the last pass.
Julian Maurice [Fri, 1 Feb 2013 08:36:36 +0000 (09:36 +0100)]
Merge remote-tracking branch 'koha_biblibre/stetienne/ft/MT9392' into dev/stetienne
Julian Maurice [Wed, 30 Jan 2013 14:18:48 +0000 (15:18 +0100)]
MT9392: Fix 'Generate next serial' when no issue has status 'Expected'
Julian Maurice [Wed, 30 Jan 2013 13:41:31 +0000 (14:41 +0100)]
MT9392: Fix serialseq generation on subscription creation
Adrien Saurat [Thu, 24 Jan 2013 15:45:44 +0000 (16:45 +0100)]
MT10351: userid generation when field is empty
When modifying a patron through different pages, the userid
generation does not behave always the same way; this patch
corrects this:
- when firstname and surname are present in the form, they
are used for the generation;
- if there are not in the form, the firstname and surname
in database are used instead.
Fridolyn SOMERS [Thu, 17 Jan 2013 08:52:13 +0000 (09:52 +0100)]
Missing a+x permissions
Fridolyn SOMERS [Mon, 14 Jan 2013 14:50:18 +0000 (15:50 +0100)]
Merge dev/stetienne in dev/unilim
Fridolyn SOMERS [Mon, 14 Jan 2013 13:25:55 +0000 (14:25 +0100)]
Merge dev/solr in dev/stetienne
BibLibre [Wed, 5 Dec 2012 13:23:51 +0000 (14:23 +0100)]
MT10696: fix on reserve code
Christophe Croullebois [Sat, 26 Nov 2011 17:33:19 +0000 (18:33 +0100)]
MT10567 : rebase MT8330 to dev/solr
Add a checkbox in batchMod.pl to delete biblio
Default checked, this option delete biblio if no more items attached, in Batch item deletion page.
Jonathan Druart [Mon, 10 Dec 2012 10:19:31 +0000 (11:19 +0100)]
MT10590: Replace GST with GST rate
Jonathan Druart [Wed, 5 Dec 2012 11:03:50 +0000 (12:03 +0100)]
MT10590: Followup Adds RRP values for the layout3pages
Jonathan Druart [Tue, 27 Nov 2012 14:01:11 +0000 (15:01 +0100)]
MT10590: FIX GST values for the basketgroup pdf export
Due to the multi VAT development, values are not well calculated in the
pdf generated by the basketgroup print action.
Jonathan Druart [Thu, 20 Dec 2012 15:52:35 +0000 (16:52 +0100)]
Merge remote-tracking branch 'origin/unilim/ft/MT9635' into dev/unilim
Jonathan Druart [Wed, 12 Dec 2012 11:00:59 +0000 (12:00 +0100)]
MT9635: FIX Translation issue
(cherry picked from commit
d769b33035eb351ca49aabb2cd62f1f060b7fb54)
Julian Maurice [Thu, 13 Dec 2012 08:59:29 +0000 (09:59 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT8761' into dev/stetienne
Julian Maurice [Tue, 11 Dec 2012 10:16:54 +0000 (11:16 +0100)]
MT9392: Fix generating next serial when there is no 'Expected' issue
Change API of GetNextSeq and GetSeq
Jonathan Druart [Mon, 3 Dec 2012 09:17:28 +0000 (10:17 +0100)]
MT9635: Followup FIX sort on Expiration date
Jonathan Druart [Mon, 26 Nov 2012 11:00:32 +0000 (12:00 +0100)]
MT10497: Add log if a record can not be indexed
Julian Maurice [Fri, 23 Nov 2012 08:05:05 +0000 (09:05 +0100)]
Merge remote-tracking branch 'origin/unilim/ft/MT9633' into dev/unilim
Julian Maurice [Wed, 21 Nov 2012 13:25:21 +0000 (14:25 +0100)]
MT9633: Hide last column if empty
Jonathan Druart [Tue, 20 Nov 2012 10:08:32 +0000 (11:08 +0100)]
Merge remote-tracking branch 'origin/unilim/ft/MT9633' into dev/unilim
Conflicts solved:
installer/data/mysql/updatedatabase.pl
kohaversion.pl
Jonathan Druart [Tue, 20 Nov 2012 10:07:32 +0000 (11:07 +0100)]
Merge remote-tracking branch 'origin/unilim/ft/MT9635' into dev/unilim
Jonathan Druart [Tue, 13 Nov 2012 10:40:45 +0000 (11:40 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT10401' into dev/solr
Jonathan Druart [Mon, 5 Nov 2012 14:22:24 +0000 (15:22 +0100)]
MT9180: Remove the column deleteditems.marc
Julian Maurice [Wed, 31 Oct 2012 15:23:41 +0000 (16:23 +0100)]
MT9633: Sort categories and subcategories by name
Jonathan Druart [Mon, 10 Sep 2012 12:17:39 +0000 (14:17 +0200)]
MT9633: Followup string changes
Edit SQL => Edit report
Group name => Group code
Group description => Group name
SubGroup name => SubGroup code
SubGroup description => SubGroup name