Jonathan Druart [Fri, 1 Jun 2012 07:43:58 +0000 (09:43 +0200)]
Merge remote-tracking branch 'origin/unilim/ft/MT6843' into dev/unilim
Julian Maurice [Wed, 30 May 2012 10:06:33 +0000 (12:06 +0200)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
Solved conflicts:
acqui/addorderiso2709.pl
Claire Hernandez [Wed, 30 May 2012 09:54:06 +0000 (11:54 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Julian Maurice [Mon, 28 May 2012 14:46:20 +0000 (16:46 +0200)]
Merge remote-tracking branch 'origin/stetienne/ft/MT9315' into dev/stetienne
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
Julian Maurice [Mon, 28 May 2012 14:10:51 +0000 (16:10 +0200)]
MT9315: Move global 'use' to in-sub 'require' to avoid circular dependencies
Julian Maurice [Mon, 28 May 2012 07:28:57 +0000 (09:28 +0200)]
Merge remote-tracking branch 'origin/stetienne/ft/MT9315' into dev/stetienne
Jonathan Druart [Thu, 24 May 2012 14:51:37 +0000 (16:51 +0200)]
MT9384,MT6843: Followup FIX ecost and rrp price
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)
Julian Maurice [Fri, 18 May 2012 07:09:21 +0000 (09:09 +0200)]
Merge remote-tracking branch 'origin/stetienne/ft/MT9461' into dev/stetienne
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.
koha et zebra [Wed, 9 May 2012 09:33:26 +0000 (11:33 +0200)]
MT8713 - Translation - Specific Unilim - correction faute de frappe ligen/ligne
Claire Hernandez [Wed, 16 May 2012 08:25:55 +0000 (10:25 +0200)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
Claire Hernandez [Wed, 16 May 2012 08:25:17 +0000 (10:25 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
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.
Jonathan Druart [Mon, 14 May 2012 11:47:24 +0000 (13:47 +0200)]
MT9384,MT6843: FIX ecost and rrp price
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 [Thu, 3 May 2012 10:40:08 +0000 (12:40 +0200)]
MT9315: Display only allowed budgets on addorderiso2709.pl
new sub C4::Budgets::CanUserManageBudget used in:
- acqui/acqui-home.pl
- acqui/addorderiso2709.pl
- acqui/neworderempty.pl
- admin/aqplan.pl
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>
Claire Hernandez [Fri, 4 May 2012 09:15:16 +0000 (11:15 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
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 14:50:19 +0000 (16:50 +0200)]
Merge remote-tracking branch 'origin/unilim/ft/MT6841' into dev/unilim
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
Julian Maurice [Wed, 2 May 2012 14:12:37 +0000 (16:12 +0200)]
MT6841: Hard-coded string translation in perl script
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 10:37:38 +0000 (12:37 +0200)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
Conflicts solved:
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
Claire Hernandez [Wed, 2 May 2012 10:21:43 +0000 (12:21 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Jonathan Druart [Wed, 2 May 2012 10:09:20 +0000 (12:09 +0200)]
Merge remote-tracking branch 'origin/stetienne/ft/MT9286' into dev/stetienne
Jonathan Druart [Wed, 2 May 2012 08:42:13 +0000 (10:42 +0200)]
MT9286: Followup FIX Visibility on parcel (receive and filter on orders)
Hide the basket link if basket_lock=1
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 [Wed, 2 May 2012 07:28:49 +0000 (09:28 +0200)]
Merge remote-tracking branch 'origin/stetienne/ft/MT9329' into dev/stetienne
Conflicts solved:
installer/data/mysql/updatedatabase.pl
kohaversion.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
Jonathan Druart [Mon, 30 Apr 2012 08:56:24 +0000 (10:56 +0200)]
MT9286: FIX Visibility on parcel (receive and filter on orders)
Jonathan Druart [Wed, 18 Apr 2012 13:33:38 +0000 (15:33 +0200)]
MT9329: Set a value for a subfield's order when items are created when receiving
new system preference AcqItemStatusWhenReceived. You can fill it :
995$o=5
When you receive an order, the 995$o for this item will be egal to 5
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
Claire Hernandez [Wed, 25 Apr 2012 08:52:09 +0000 (10:52 +0200)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
Claire Hernandez [Wed, 25 Apr 2012 08:51:30 +0000 (10:51 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Julian Maurice [Tue, 24 Apr 2012 13:39:37 +0000 (15:39 +0200)]
Merge remote-tracking branch 'origin/solr/ft/rpn2solr' into dev/solr
Jonathan Druart [Tue, 27 Mar 2012 10:20:53 +0000 (12:20 +0200)]
MT9118,6927: FIX missing field old_reserves.firstavailablebranch
Julian Maurice [Tue, 24 Apr 2012 07:39:25 +0000 (09:39 +0200)]
Merge remote-tracking branch 'origin/stetienne/ft/MT8377' into dev/stetienne
Claire Hernandez [Mon, 23 Apr 2012 12:31:43 +0000 (14:31 +0200)]
MT8667 Syck parser error
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:18:42 +0000 (09:18 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Solved conflicts:
catalogue/labeledMARCdetail.pl
Julian Maurice [Wed, 18 Apr 2012 07:13:58 +0000 (09:13 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9380' into dev/solr
Julian Maurice [Wed, 18 Apr 2012 07:11:37 +0000 (09:11 +0200)]
Merge remote-tracking branch 'origin/stetienne/ft/MT9042' into dev/stetienne
Julian Maurice [Wed, 18 Apr 2012 07:05:03 +0000 (09:05 +0200)]
Merge remote-tracking branch 'origin/stetienne/ft/MT7161' into dev/stetienne
Julian Maurice [Wed, 18 Apr 2012 07:04:12 +0000 (09:04 +0200)]
Merge remote-tracking branch 'origin/stetienne/ft/MT8698' into dev/stetienne
Claire Hernandez [Tue, 17 Apr 2012 14:44:33 +0000 (16:44 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Conflicts solved:
cataloguing/additem.pl
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
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
Jonathan Druart [Mon, 16 Apr 2012 13:57:29 +0000 (15:57 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT7881' into dev/solr
Claire Hernandez [Mon, 16 Apr 2012 10:32:03 +0000 (12:32 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Jonathan Druart [Mon, 16 Apr 2012 10:10:32 +0000 (12:10 +0200)]
MT9184: On return, statistics.itemtype is badly filled
Jonathan Druart [Thu, 12 Apr 2012 13:49:17 +0000 (15:49 +0200)]
MT9388 remove some warnings in cataloguing/addbiblio.pl
Jonathan Druart [Thu, 12 Apr 2012 14:27:05 +0000 (16:27 +0200)]
[SOLR]MT9388 remove some warnings in C4/Reserves.pm
Jonathan Druart [Thu, 12 Apr 2012 14:21:19 +0000 (16:21 +0200)]
[SOLR]MT9388 remove some warnings in C4/Members.pm
Jonathan Druart [Thu, 12 Apr 2012 14:15:34 +0000 (16:15 +0200)]
[SOLR]MT9388 remove some warnings in C4/Circulation.pm
Jonathan Druart [Thu, 12 Apr 2012 14:49:18 +0000 (16:49 +0200)]
[SOLR] Change the verbosity for Solr log
Jonathan Druart [Thu, 12 Apr 2012 13:34:37 +0000 (15:34 +0200)]
[SOLR]MT9388 Remove obsolete code counting issues by item type in circ (cf BZ5137)
Jonathan Druart [Thu, 12 Apr 2012 13:34:00 +0000 (15:34 +0200)]
[SOLR]MT9388 remove warnings in circ/ysearch.pl
Claire Hernandez [Thu, 12 Apr 2012 12:45:15 +0000 (14:45 +0200)]
Merge remote-tracking branch 'origin/solr/ft/logger' into dev/solr
Claire Hernandez [Thu, 12 Apr 2012 12:44:02 +0000 (14:44 +0200)]
[SOLR] Logger followup - operator mistake
Jonathan Druart [Thu, 12 Apr 2012 09:58:46 +0000 (11:58 +0200)]
MT7161: Don't fill notes field in neworderempty only if it is a new order
Jonathan Druart [Thu, 12 Apr 2012 09:58:08 +0000 (11:58 +0200)]
Revert "MT7161 Don't fill notes field in neworderempty"
This reverts commit
5337516e490737fbc049668bf22d3b7e06e17561.
Jonathan Druart [Thu, 12 Apr 2012 09:30:08 +0000 (11:30 +0200)]
MT9042: Followup: alert on delete biblio when it's attached to an order
Fix field name and parentheses around the condition
Jonathan Druart [Thu, 12 Apr 2012 08:10:30 +0000 (10:10 +0200)]
[SOLR] MT9380: Cannot delete records from Labeled MARC view
BZ4849
Julian Maurice [Wed, 11 Apr 2012 09:59:47 +0000 (11:59 +0200)]
MT9261: fix admin/matching-rules.pl
Fix a bug that prevent the user to add or remove matchchecks
Claire Hernandez [Tue, 10 Apr 2012 15:27:36 +0000 (17:27 +0200)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim
Conflicts solved:
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
Claire Hernandez [Tue, 10 Apr 2012 15:25:19 +0000 (17:25 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Jonathan Druart [Tue, 10 Apr 2012 11:45:07 +0000 (13:45 +0200)]
MT9042: Followup: alert on delete biblio when it's attached to an order
uniq on parent_ordernumber
Jonathan Druart [Tue, 10 Apr 2012 13:52:51 +0000 (15:52 +0200)]
MT7881: Followup: DataTables on additem.pl
FIX overflow
Jonathan Druart [Tue, 27 Mar 2012 09:07:42 +0000 (11:07 +0200)]
MT9042: alert on delete biblio when it's attached to an order
Jonathan Druart [Tue, 3 Apr 2012 09:15:35 +0000 (11:15 +0200)]
MT7881: DataTables on additem.pl
Julian Maurice [Fri, 6 Apr 2012 12:36:11 +0000 (14:36 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT8199' into dev/solr
Julian Maurice [Fri, 6 Apr 2012 12:34:59 +0000 (14:34 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9170' into dev/solr
Julian Maurice [Fri, 6 Apr 2012 12:33:08 +0000 (14:33 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT6556' into dev/solr
Julian Maurice [Fri, 6 Apr 2012 12:32:11 +0000 (14:32 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9326' into dev/solr
Julian Maurice [Fri, 6 Apr 2012 12:29:48 +0000 (14:29 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9258' into dev/solr
Jonathan Druart [Tue, 3 Apr 2012 08:33:26 +0000 (10:33 +0200)]
[SOLR]MT6556: Change permissions for renewscript.pl
Jonathan Druart [Wed, 4 Apr 2012 08:32:58 +0000 (10:32 +0200)]
[SOLR][LOGGER] FIX undefined variable issuingrules
Julian Maurice [Wed, 4 Apr 2012 07:51:06 +0000 (09:51 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Jonathan Druart [Tue, 3 Apr 2012 12:27:52 +0000 (14:27 +0200)]
MT9326: Displaying cn_source as Call number source in catalogue/detail.pl
Julian Maurice [Tue, 3 Apr 2012 07:42:34 +0000 (09:42 +0200)]
MT8377: Fix CanItemBeReserved when issuingrule.holdrestricted == 1
Check was done on borrower branch and the branch returned by
GetReservesControlBranch. But this sub can return the borrower branch if
ReservesControlBranch = 'PatronLibrary' so the check always fail and a
borrower can reserve a book from another branch even with holdrestricted
set.
Check is now done on borrower branch and item (home or holding) branch,
regardless of syspref ReservesControlBranch
Julian Maurice [Mon, 2 Apr 2012 11:59:49 +0000 (13:59 +0200)]
MT9170: addbiblio check mandatory fields and textarea
Check was only done on 'input' tags. So a mandatory field with all
'input' empty but with filled 'textarea' was preventing the record to be
saved with an alert message "Field XXX is mandatory, at least one of its
subfields must be filled"
Jonathan Druart [Mon, 2 Apr 2012 10:48:26 +0000 (12:48 +0200)]
MT9078: Followup Merging stetienne and limoges features for z3950 search
Matthias Meusburger [Wed, 22 Feb 2012 16:03:37 +0000 (17:03 +0100)]
MT9074: Fix mandatory hidden subfields bug in new orders
- When a mandatory item subfield was hidden in the bibliographic framework,
placing a new order in acquisitions would fail, without any indication
of the nature of the fail. This patch adds an error message telling the
user which subfield was hidden and mandatory, and how to fix the problem.
- Also, for empty mandatory subfields (which were not hidden), a visual
emphasizing was supposed to show the user which subfields he should have
filled. This doesn't seem to work anymore in this branch. This patch adds
the same kind of message as for the hidden subfields. This is a quickfix
and the original code should be fixed.
Sophie Meynieux [Tue, 20 Mar 2012 13:23:35 +0000 (14:23 +0100)]
MT9055 : Modify scheduler to run reports. Adding csv file output, and correct mail sending
Jonathan Druart [Mon, 2 Apr 2012 09:11:22 +0000 (11:11 +0200)]
MT9258: FIX Allow to delete shelf if there is > 20shelves
Julian Maurice [Fri, 30 Mar 2012 09:47:31 +0000 (11:47 +0200)]
Fix Perl warnings in C4::Reserves and C4::Serials
+ fix indentation for two subs in C4::Reserves
(cherry picked from commit
d2dc964206033965457ac40c136afdffce957ca2)
Claire Hernandez [Fri, 30 Mar 2012 09:59:14 +0000 (11:59 +0200)]
Merge remote-tracking branch 'origin/solr/ft/logger' into dev/unilim
Julian Maurice [Fri, 30 Mar 2012 09:47:31 +0000 (11:47 +0200)]
Fix Perl warnings in C4::Reserves and C4::Serials
+ fix indentation for two subs in C4::Reserves
Jonathan Druart [Wed, 14 Mar 2012 12:41:15 +0000 (13:41 +0100)]
[SOLR] FIX autocomplete in overdue
(cherry picked from commit
bdba006b61ea5bda6dd0f145459e0b32d5d9eea4)
Julian Maurice [Thu, 29 Mar 2012 09:50:26 +0000 (11:50 +0200)]
Merge remote-tracking branch 'origin/solr/ft/logger' into dev/solr
Claire Hernandez [Wed, 28 Mar 2012 15:26:24 +0000 (17:26 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Julian Maurice [Wed, 28 Mar 2012 14:02:17 +0000 (16:02 +0200)]
[Logger] Take log level into account even if Log::LogLite fails to initialize
+ fix unit tests t/Logger.t
+ remove whitespace errors
Jonathan Druart [Wed, 28 Mar 2012 12:19:06 +0000 (14:19 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9200' into dev/solr