Paul Poulain [Wed, 30 Nov 2011 16:07:29 +0000 (17:07 +0100)]
Merge branch 'new/bug_6328'
Paul Poulain [Wed, 30 Nov 2011 13:53:48 +0000 (14:53 +0100)]
Bug 7272 setting NULL to debarred field, to avoid having 0000-00-00
0000-00-00 can come only from a problem in the 3.06.00.001 update
Paul Poulain [Mon, 28 Nov 2011 11:20:58 +0000 (12:20 +0100)]
Merge remote-tracking branch 'origin/new/bug_6894'
Paul Poulain [Mon, 28 Nov 2011 11:13:42 +0000 (12:13 +0100)]
fixing the translatable-template.t to handle localized setups
Depending on your locale, msgmerge will return a different messages, enclosed in .... and .
The flow is not utf8 compliant, so this patch switches to testing "..... anything." instead of ".... word."
Now the test work on my (french setup)
Chris Cormack [Mon, 7 Nov 2011 02:30:20 +0000 (15:30 +1300)]
Bug 7268: Fixing failing tests for translatable templates
To test run
perl xt/author/translatable-templates.t
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test runs without any complaints about the fixed templates now.
Also checked detail pages without XSLT turned on display correctly.
Katrin Fischer [Tue, 25 Oct 2011 15:38:04 +0000 (17:38 +0200)]
Bug 6894: Order from suggestion defaulting to wrong currency
This problem turned out to be a bit different, than I initally thought.
This patch fixes the currency selections for new orders created in staff.
Before this patch, the first currency in the list was selected instead
of the active currency. So you needed to change it explicitly.
After patch it should work like this:
1) Suggestion created in OPAC - currency defaults to NULL in database
2) Editing a suggestion created in OPAC will default to active currency.
3) Creating a new suggestion in staff will default to active currency.
4) When ordering, the currency will default to the vendor currency, if no
currency is set in the suggestion. (still happens, when suggestions are accepted
in batch from the list.
I hope this is right - comments and testing appreciated.
Signed-off-by: Liz Rea <lrea@nekls.org>
Verified that in the above places, active currency was displayed or selected. Tested both suggestions entered from the OPAC and from the intranet.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Verified the existence of the bug, and that the fix works as advertised.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Mon, 28 Nov 2011 09:12:23 +0000 (10:12 +0100)]
Merge branch 'new/bug_6328'
Chris Cormack [Sun, 27 Nov 2011 07:30:49 +0000 (20:30 +1300)]
Bug 6328 : Previous patches broke templates, this is fixing them
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes xt/tt_valid.t
Checked the member entry page, didn't find any problems.
Chris Cormack [Fri, 25 Nov 2011 18:39:51 +0000 (07:39 +1300)]
Bug 6628 : Stopping a potential vulnerability
Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- verified help pages still work
- verified /cgi-bin/koha/help.pl?url=koha/../catalogue/advsearch.pl does not
show the template file (did work on master, not after applying patch)
- verified cgi-bin/koha/help.pl?url=koha/../../../../../../etc/passwd%00.pl does not work (didn't work on master or after applying patch)
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
The potential vulnerability would allow anyone to see the content of any .tt file, and .tt only. Was much less critical than the vulnerability for 6629, but it's worth fixing !
Paul Poulain [Mon, 28 Nov 2011 08:46:23 +0000 (09:46 +0100)]
Merge branch 'new/bug_6629'
Chris Cormack [Sun, 27 Nov 2011 08:58:04 +0000 (21:58 +1300)]
Bug 6629 : Follow up, sanitising in a couple more places
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Chris Cormack [Sun, 27 Nov 2011 08:18:29 +0000 (21:18 +1300)]
Bug 6629 : Follow up to trap vuln in webinstaller and fixing the error
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes problem occuring in web installer.
Paul Poulain [Fri, 25 Nov 2011 13:29:04 +0000 (14:29 +0100)]
Merge remote-tracking branch 'origin/new/bug_7250'
Katrin Fischer [Mon, 21 Nov 2011 06:54:15 +0000 (07:54 +0100)]
Bug 7250: stage_biblios_file.pl is missing options for encoding
- adds command line options for encoding, defaulting to utf8
- options match options availablen in the stage marc records form
of the staff interface
- activates warnings
- adds copyright statement
To test:
Import records with diacritics using the stage_biblios_file.pl
Records can be imported into the catalog using the staff interface
or the commit_biblios_file.pl script.
Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>
Successfully tested with default encoding utf8.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Colin Campbell [Sat, 17 Sep 2011 11:45:09 +0000 (12:45 +0100)]
Bug 6877 - use is executed and errors at compile time
Although use is being called in an eval it will still be executed
at compile time so that an error can cause the script to abort before
the eval is executed. The eval expression syntax is not checked
so eval block should be preferred.
Use require/import which execute at runtime which is the intention
here.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
checked that, with Libravatar OK things are still OK
Paul Poulain [Fri, 25 Nov 2011 13:09:06 +0000 (14:09 +0100)]
bug 6328: updatedatabase bump
Paul Poulain [Fri, 21 Oct 2011 15:23:36 +0000 (17:23 +0200)]
Bug 6328 Fixes for comment 35
* correctly indenting with tab the debarrcomment field
* setdebar.pl is called without status parameter, thus it is not working anymore. It's fixed & some dead code has been removed. To test : debar someone, then go to patron detail page and click "lift debarment"
* the test function had not been updated. The fix define a debarment date of 2099-12-31 (no limit)
Paul Poulain [Tue, 11 Oct 2011 16:22:27 +0000 (18:22 +0200)]
Bug 6328 follow-up for QA comments
* fixed documentation in C4/Auth_with_ldap.pm
* updated ILSDI/Utility.pm to work with debarred being a date
* updated Members.pm/patronflags to work with debarred being a date (copy/paste of BibLibre code that had not been backported)
* fixed opac-reserve to check correctly for debarred status
I also have removed a duplicate line on circulation.pl when the patron was restricted = the information was displayed twice
Paul Poulain [Wed, 11 May 2011 14:54:56 +0000 (16:54 +0200)]
Bug 6328 fine in days does not work
Some code coming from BibLibre has been lost in the process of inclusion in
3.4. The result is that fine in days does not work at all (you can setup rules,
but it does nothing)
Step to reproduce:
- Koha > Admin > circ rules > set 1 day fine every day of overdue for default
rule
- Issue a book return date last week
- check-in the book => no debarment is set
The following patch will fix all of those problems by :
* updating borrowers.debarred to a date field (instead of tinyint). It contains
the limit of the debarment
* changing API of DebarMember and UpdateBorrowerDebarred to pass a date
* display debarrdate where applicable. Note that a debarrdate of 31/12/9999 is
considered as unlimited and not displayed
* added a debarrcomment, usefull to explain why a patron is debarred (this is
independant from debarrdate changes and can be used when placing an unlimited
debarment too)
[2011-05-12] F. Demians. It works as described. And I can confirm this
functionality is impatiently awaited by French libraries since one year. Thanks
BibLibre for the good work and for contributing this code.
Bug 6328 Followup--update DB structure
Thanks Katrin.
Bug 6328: make comment a textbox / fix debar by notice trigger
Debarring by notice triggers was broken, because the new function
expects a date as second parameter.
The comment field in patron account details was a very long text field.
Patch changes it to be a textbox instead.
Bug 6328: Lift debarment leaves patron account
'Lift debarment' redirects to an empty circulation page.
BZ6328 follow-up 3
Fixes comment 23 from Fernando L. Canizo : when the patron was debarred and debar removed
he still could not check-out.
The changes in the IsMemberBlocked (that were on biblibre/master) were lost somewhere
The sub was still checking for old_issues instead of calling CheckBorrowerDebarred
to get a debardate if applicable
Note : this bug was appearing only is you had issuing rules defined for itemtype/categorycode/branch.
Seemed to work if you had only default rules. That's probably why it hadn't been spotted before
BZ6328 follow-up 4
Comments fron Zeno Tajoli: The patch is OK and I sign-off it. Two little changes done on
installer/data/mysql/kohastructure.sql and installer/data/mysql/updatedatabase.pl
Signed-off-by: koha <koha@kohabase.localdomain>
Paul Poulain [Fri, 25 Nov 2011 12:59:25 +0000 (13:59 +0100)]
Merge remote-tracking branch 'origin/new/bug_5974'
Paul Poulain [Fri, 25 Nov 2011 12:58:48 +0000 (13:58 +0100)]
follow-up: trailing " that makes T::T fail
Paul Poulain [Fri, 25 Nov 2011 10:43:04 +0000 (11:43 +0100)]
Merge remote-tracking branch 'origin/new/bug_3388'
Katrin Fischer [Fri, 28 Oct 2011 15:33:31 +0000 (17:33 +0200)]
Bug 3388: Restore account number on vendor page
This patch makes it possible to add the account number to the
vendor information. The used field aqbookseller.accountnumber was
already existent in the database.
To test:
1) Add a new vendor with accountnumber
> Verify form has a field for accountnumber
> Verify accountnumber does show up on vendor summary page
2) Edit this vendor, change accountnumber
> Verify change was correctly saved and new number is displayed on
vendor summary page
3) Delete accountnumber
Signed-off-by: Liz Rea <lrea@nekls.org>
Tested 1-3, no troubles found.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Chris Cormack [Fri, 25 Nov 2011 06:07:28 +0000 (19:07 +1300)]
Bug 6629 : Sanitizing input from language cookie
I dont think we can use only 2 digits, some languages is much longer
zh-hans-TW for example
But the regex should stop it bening able handle nasty chars,
whitelisting safe ones instead
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I checked the patch doesn't break language switching and language selection.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
I confirm the bug security issue was not here for master, but this fix improve the behaviour, so pushing it
Marcel de Rooy [Wed, 23 Nov 2011 12:33:26 +0000 (13:33 +0100)]
Bug 7254 Show pending orders from baskets with closedate > 180 days
Current code for selecting pending orders does not select orders from baskets
with a closedate > 180 days.
The code in Acquisition.pm already includes a FIXME for that.
IMHO this part of the where clause should just be removed; an order is pending
until it is filled. If you do not want to fill it, delete it.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Chris Cormack [Mon, 21 Nov 2011 07:30:19 +0000 (20:30 +1300)]
Bug 4330: Missing License Statement
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Chris Cormack [Mon, 21 Nov 2011 07:26:01 +0000 (20:26 +1300)]
Bug 4330: Wrong address for Free Software Foundation
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Owen Leonard [Mon, 28 Mar 2011 18:08:00 +0000 (14:08 -0400)]
Fix for Bug 5974 - Bogus auth check for "StaffMember" role
Also removing some YAHOO.widget.Button declarations which
are redundant.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Colin Campbell [Tue, 8 Nov 2011 12:46:39 +0000 (12:46 +0000)]
Bug 7191 Remove GetBorrowerIssues from @EXPORT
No subroutine GetBorrowerIssues exists in C4::Circulation
So don't export it into users' namespace
Signed-off-by: Albert Oller <ago@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Robin Sheat [Fri, 15 Jul 2011 03:04:31 +0000 (15:04 +1200)]
Bug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4 series
This brings all the changelog entries for releases up to what has been
included in the packages
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Robin Sheat [Wed, 26 Oct 2011 02:03:36 +0000 (15:03 +1300)]
Bug 7091 - [MASTER] - update the build version for packages from master
This updates the default version number that packages are build with to
be 3.7. This should be applied to master only.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Ian Walls [Thu, 20 Oct 2011 19:54:07 +0000 (15:54 -0400)]
Bug 7073: GetCOinSBiblio should take $record object, not biblionumber
This patch changes the GetCOinsBiblio subroutine to take a MARC record object
(as returned from GetMarcBiblio) instead of a biblionumber. The first thing the subroutine
did was GetMarcBiblio, and the $biblionumber passed was never used again.
This subroutine was only used 3 places: opac/opac-search.pl, opac/opac-detail.pl,
and C4/VirtualShelves/Page.pm. In the first and last cases, it was used in a loop.
In the last two cases, a call to GetMarcBiblio had already been done. This is expensive, and
we were doing it twice per record.
For opac/opac-search.pl, the call to GetMarcBiblio was moved to just outside GetCOinSBiblio;
this will not change the performance at all. But for opac/opac-detail.pl and C4/VirtualShelves/Page.pm,
a redudant call to GetMarcBiblio is now avoided.
To Test:
1. Enable COinSinOPACResults in system preferences. Perform a search in the OPAC.
Verify that the COinS spans are showing up
2. View the detail record of one of the returned items. Confirm that the COinS span exists on the detail page.
3. View a list in the OPAC. Confirm that COinS spans are still showing up
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Srdjan Jankovic [Wed, 16 Nov 2011 23:45:47 +0000 (12:45 +1300)]
Bug 6303: Display Organisation and Parent Organisation names when viewing a borrower of type organisation
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as advertised, doesn't affect display for non-organisational patrons.
Note: Display change in OPAC only affects the summary tab.
It would be a little bit more consistent to make the name show the
same on all tabs in OPAC patron account.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
I repeated Katrin's signoff here (with permission). The patch only changed for some minor rebasing and cosmetic QA requests. Passed QA now.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Thu, 24 Nov 2011 09:48:14 +0000 (10:48 +0100)]
Merge branch 'new/enh/bug_4877'
Magnus Enger [Mon, 17 Oct 2011 10:23:09 +0000 (12:23 +0200)]
Bug 4877 - Add DocBook for missing manual pages
Add DocBook manual pages for commands that do not have a manual page yet. Also
add a page for koha-common itself, listing all the available commands.
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Minor change: I fixed a typo I spotted
Chris Cormack [Thu, 17 Nov 2011 23:12:29 +0000 (12:12 +1300)]
Bug 7242 : Fixing typo in a div
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Frédéric Demians [Sat, 27 Aug 2011 11:32:08 +0000 (13:32 +0200)]
Bug 6799 rebuild_zebra.pl -x produces invalid XML records
This patch allow to handle properly items containing extended characters and
send valid XML records to zebraidx
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Fri, 18 Nov 2011 22:28:38 +0000 (23:28 +0100)]
Joy nelson was already in history.txt, removing the entry
Owen Leonard [Fri, 11 Nov 2011 17:34:44 +0000 (12:34 -0500)]
Incremental fix for Bug 2847, Use HTML escape in templates where appropriate
Fixes for output in a couple of acquisitions templates where
user-generated data should be escaped. This instances were found
by creating a vendor name like "Baker & Taylor" and finding
that the ampersand was not escaped, causing validation errors.
This patch also consolidates multiple <script> blocks which
do not need to be separate and corrects a couple of unclosed
<input> tags.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Ian Walls [Thu, 17 Nov 2011 15:27:47 +0000 (10:27 -0500)]
Bug 7134: patron records getting corrupted birthdates
If no date of birth is provided in a new member form, the borrower gets the birthdate of "00/02/0", which
is obviously incorrect (the result of passing 0 to the database directly)
The fix is to remove a conditional check buried deep in C4::SQLHelper. This is in a helper subroutine that was changed
for the Unified Member Search dev (bug 6253). Reverting this small change to the conditional does not seem to break
search, but testing will be required.
To test:
1. apply patch, and create a new patron with blank birthdate. The new patron should now have a blank birthdate instead of '00/02/0'
2. search for a borrower by 1 part surname, confirm search works
3. search for a borrower by 2 part surname, confirm search works
4. search for a borrower across firstname AND surname; confirm
5. search for a borrower and include categorycode/branchcode filters
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
I confirm all working tests 1-5
1. Created patron with blank birthdate - birthdate was blank
2. Searched for patron "henry james acevedo III" by using "acevedo" - result was correct
3. Searched for mr. acevedo using "Acevedo III" - result was correct
4. Searched for Henry James Acevedo III, Henry Acevedo and James Acevedo - results were correct
5. Searched for Mr Acevedo with the branch he was not in, with the branch he is in, with a category he was not, and a category he was. All results were correct.
also noted: inner searching seems to be working now? Example: Henry James (firstname) Acevedo III (surname) - searching James Acevedo brings back the correct patron.
Not complaining, just noting. :)
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Chris Nighswonger [Wed, 26 Oct 2011 15:14:05 +0000 (11:14 -0400)]
Bug 7095: Fixing cut and paste error and removing the use of diag() as this does not produce output when the test is run in a harness
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Frédérick Capovilla [Fri, 21 Oct 2011 16:04:03 +0000 (12:04 -0400)]
Bug 6977: Follow-up patch : catch CloneSubfield errors
A javascript error could occur if the CloneSubfield function failed for
any reason. This would prevent the popup from disappearing.
Example : Importing informations of a UNIF_TITLE authority with multiple
$x subfields in the biblio's 440 field. 440$x isn't repeatable, so an
error occurs when trying to clone it.
http://bugs.koha-community.org/show_bug.cgi?id=6977
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Salvador Zaragoza Rubio [Wed, 22 Jun 2011 16:18:40 +0000 (18:18 +0200)]
Bug 6475 - Edit it's not possible in subfield "0" in MARC framework
When trying to modify the subfield "0" on a field in the
MARC subfield structure admin -> Tag xxx Subfield Constraints,
the boolean condition on liblibrarian fails for the initial "0" value.
Modified condition to allow the value "0"
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Liz Rea [Mon, 24 Oct 2011 20:26:32 +0000 (15:26 -0500)]
Bug 7084 - Re-arranging results_summary for tags so that it applies where it is supposed to
To test:
Verify that New Tag text is the same size as all of the other surrounding text.
Verify that it is consistent in size with results that have existing tags.
See screenshot for what it looked like before:
http://screencast.com/t/hnt15kpS7SH9
Notice that the Add button and New tag text were slightly larger than the
similar constructions for results with existing tags. This patch should fix
that.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
I made sure I had a results list with on record with tags and one without.
Before applying the patch the "New tag" text and "Add" button were
inconsistent for the two records, after applying it they look the same. Nice!
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Katrin Fischer [Mon, 24 Oct 2011 12:57:52 +0000 (14:57 +0200)]
Bug 7079: [SIGNED-OFF] Default values for German system preferences
Patch adds updates for system preferences to the sql file
in the installer directory:
- New: AmazonLocale: DE
- borrowerRelationship: Vater|Mutter
- BorrowersTitles: Herr|Frau
- New: CurrencyFormat: FR
- New: dateformat: metric
- New: DefaultClassificationSource: z
- New: OpacMainUserBlock: translated content
- New: OpacNav: translated content
- New: OpacNavBottom: translated content
- New: OPACSearchForTitleIn: translated content
To test:
A) Do a full installation with German sample files
B) Run the sql file 'system_preferences.sql' against your database
Verfy values of system preferences have been changed.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Patch applied cleanly. I ran through the webinstaller in German on an empty
database, and made sure system_preferences were loaded. No complaints from
the database and the systprefs are set to the right values when I check in the
staff client.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Frédérick Capovilla [Fri, 14 Oct 2011 19:52:30 +0000 (15:52 -0400)]
Make all strings translatable in marc21_field_007.tt
http://bugs.koha-community.org/show_bug.cgi?id=7033
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan:
- apply patch
- update po files using 'perl translate update <language-code>
- check po files for new strings from 007 plugin
- translate some / all of them
- update templates with changed po files 'perl translate install <language-code>
- verify 007 still works and got translated
Robin Sheat [Fri, 16 Jul 2010 02:45:58 +0000 (14:45 +1200)]
Bug 6916 - item's acq date now takes you to its invoice
When viewing an item's details, selecting the accession date for it now
takes you to the invoice for that item.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
This works as advertised.
1) Order and receive an item in acquisition
2) Search for it in staff and go to the 'items' tab
3) Click on the 'receive date' link
Fixed conflict in moredetail.pl.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
QA. This patch does only work when AcqCreateItem==placing an order. This is caused by an existing bug. See Bugzilla for more details.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Frédéric Demians [Fri, 13 May 2011 10:33:58 +0000 (11:33 +0100)]
Bug 6321 Add a 1/4 months frequency
Thanks Stefano Bargioni for the typo fix
[2011.09.16] Thanks Paul for catching the display error.
[2011.10.11] Thanks Katrin for finding display error on OPAC.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested prediction pattern and display in OPAC.
No problems found.
Paul Poulain [Thu, 17 Nov 2011 15:50:54 +0000 (16:50 +0100)]
updating history.txt : 3.6.0 & 3.4.6 & KohaCon11 & Joy Nelson 160th
Joy Nelson [Mon, 14 Nov 2011 22:23:49 +0000 (17:23 -0500)]
Bug 7221: C4/Biblio.pm documentation is incorrect.
$dbh is not a valid first parameter. Removed $dbh from line 392 to show correct syntax.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Chris Nighswonger [Wed, 9 Nov 2011 19:51:01 +0000 (14:51 -0500)]
Bug 7207 - Reverting a portion of commit
607b5449bd5cb which breaks the label export script.
squashed chris_n's two patches. Label export works again. Also changed the pattern for the item_number to the known working, critic friendly pattern.
Don't change $_ in a list context
Changed the 3rd bit to the critic friendly pattern chris_n suggests in the previous two lines.
Signed-off-by: Brendan <brendan@bywatersolutions.com>
Owen Leonard [Thu, 10 Nov 2011 21:28:53 +0000 (16:28 -0500)]
Follow-up fix for Bug 5150 - Issuing should read Circulation
Really just a typo, but I found it when trying to chase
down instances of this bug, so here you go.
Nahuel ANGELINETTI [Mon, 17 May 2010 13:43:37 +0000 (15:43 +0200)]
(bug #4518) enhance 2.2 to 3.0 scripts
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 24 Oct 2011 15:48:29 +0000 (17:48 +0200)]
Bug 4161: Preselect active currency for new vendors
Currently when creating a new vendor in acquisitions the alphabetical first
currency will be preselected. For better usability and less mistakes the
active curency should be preselected.
To test:
Check your currency settings in administration.
Your active currency should not be the first in the list.
1) Create a new vendor
Verify the active currency is selected for list and invoice prices.
2) Check vendor summary page
Verify the correct currencies from the vendor record are shown here.
3) Edit vendor
Verify the correct currencies from the vendor record are shown here.
Signed-off-by: Liz Rea <lrea@nekls.org>
Verified with tests 1, 2, and 3.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Ian Walls [Mon, 26 Sep 2011 20:38:39 +0000 (16:38 -0400)]
Bug 2629: Add diacritic support for Ů (U with ring)
Adds Ů and ů support to word-phrase-utf.chr. These characters are used in
Czech, for example the author Martinů, Bohuslav (1890-1959)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Wed, 9 Nov 2011 16:29:17 +0000 (17:29 +0100)]
Revert "Bug 6015 : Improving load_testing"
sorry, was not supposed to be pushed (follow-up needed)
This reverts commit
47d74bb3fb4b564a73c6bfb9e4404a1567b5b8fc.
Ian Walls [Fri, 4 Nov 2011 10:26:01 +0000 (06:26 -0400)]
Bug 5945: email not searchable in patron search
Adds 'email' to valid search parameters in members/member.pl
To test:
1. give a patron a unique email address in your test database
2. search on the full email; should work
3. search on the part of the email before the domain; should work
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Katrin Fischer [Wed, 2 Nov 2011 23:44:36 +0000 (00:44 +0100)]
Bug 7138: Can't print basket group order pdf
PDF print of basket groups is broken.
To test:
1) Make sure OrderPdfFormat is set to pdfformat::layout2pages or pdfformat::layout3pages
2) Create a basket with orders
3) Close the basket and create a basket group checking the checkbox
4) Print the basket group as PDF
Before patch the file is broken and when opened in an editor contains an error message.
After the patch the PDF should be generated correctly again.
Thx to Chris for helping me to fix the problem.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Henri-Damien LAURENT [Thu, 25 Mar 2010 10:37:19 +0000 (11:37 +0100)]
Bug 6015 : Improving load_testing
Adding a benchmark for OPAC
it tests :
- mainpage
- search page
- detail page
Staff :
Adding a test on member searches
Chris Cormack [Mon, 31 Oct 2011 07:57:19 +0000 (20:57 +1300)]
Bug 6679: Fixing admin/aqplain :encoding(UTF-8) gives strict validation
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
tested with diacritics, no changes before and after the patch
Chris Cormack [Wed, 2 Nov 2011 03:27:48 +0000 (16:27 +1300)]
Bug 6679 : Tidying changed parts of file
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Chris Cormack [Wed, 2 Nov 2011 03:24:05 +0000 (16:24 +1300)]
Bug 6679 : Don't declare variables in conditionals
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Chris Cormack [Wed, 2 Nov 2011 03:19:36 +0000 (16:19 +1300)]
Bug 6679 : Not using strict .. bad script, no cookie for you!
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Chris Cormack [Wed, 2 Nov 2011 03:13:20 +0000 (16:13 +1300)]
Bug 6679 : Don't declare variables in conditionals Don't change $_ in a list context search.cpan.org/~elliotjs/Perl-Critic-1.116/lib/Perl/Critic/Policy/ControlStructures/ProhibitMutatingListFunctions.pm
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Chris Cormack [Wed, 2 Nov 2011 03:00:01 +0000 (16:00 +1300)]
Bug 6679 : Declare variables outside of conditionals
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Sun, 6 Nov 2011 16:56:36 +0000 (17:56 +0100)]
Merge remote-tracking branch 'origin/new/bug_6390'
Ian Walls [Tue, 18 Oct 2011 20:13:15 +0000 (16:13 -0400)]
Bug 6390 Followup: Basket's authorisedby might not be a borrowernumber
aqbasket.authorisedby is not foreign key constrainted to borrowers.borrowernumber,
so if it's anything other than that, vendor search breaks by using an undefined value
(GetMember() on an invalid borrowernumber) as a HASH ref.
This patch sets the branchcode (the desired value from GetMember) to a blank value, then only
changes it if GetMember is defined. In the case where the authorisedby librarian has been deleted,
or the value is otherwise invalid, and AcqViewBaskets is set to 'branch', the basket will not appear
except to superlibrarians
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Invalid borrowernumber in aqbasket.authorisedby no longer breaks search.
Paul Poulain [Fri, 16 Sep 2011 22:58:41 +0000 (00:58 +0200)]
Bug 7188: C4::Context::db_scheme2dbi does case-insensitive grep
Checking NYTProf in C4::Context, it appears that the /i flag is highly time-consumming
As we don't support anything outside from mysql, returning directly mysql directly
If in a future version PostgresSQL works, then we will have to update this sub. But if an ORM is introduced, this code will be removed completly anyway
Testing note:
Drops execution time of the line from 300ms to 20 microseconds (in my testing).
Julian Maurice [Sun, 6 Nov 2011 08:44:40 +0000 (14:14 +0530)]
Bug 7185: Fix updatedatabase message for 3.6.0 release
Signed-off-by: François Charbonnier <francois.charbonnier@biblibre.com>
Paul Poulain [Sun, 6 Nov 2011 08:36:52 +0000 (09:36 +0100)]
Bug 7184 raise mySQL error if debug is set
Before this patch, if a mySQL occured in Koha (any error), then the user was seeing nothing.
With this patch, if DEBUG is set in Koha VirtualHost, any mySQL error will make Koha die and display the SQL error
Step to test:
=== BEFORE PATCH ===
go anywhere, and change a mySQL statement to make it invalid.
Launch a page using the SQL you've made wrong, you'll see nothing, except you won't see the expected results
=== AFTER PATCH ===
Modify koha-httpd.conf, and add the following line, in the virtualhost (if it does not already exist)
SetEnv DEBUG 1
restart/reload Apache
Launch the same page, you'll get a Perl statement saying something like:
DBD::mysql::st execute failed: <<blablabla SQL error>> at <<where the error was raised line <<error line>>
Paul Poulain [Sun, 6 Nov 2011 11:04:43 +0000 (12:04 +0100)]
Merge remote-tracking branch 'origin/new/bug_7146'
Liz Rea [Tue, 1 Nov 2011 19:01:17 +0000 (14:01 -0500)]
Bug 7128 - adding some ID's to make styling opac-main.tt a bit easier
To test:
verify that the loggedin id is added when user is logged in
verify that the notloggedin id is evident when no user is logged in.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 7128 : Follow up, adding the id to the case when a user is not logged in
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Sun, 6 Nov 2011 10:54:53 +0000 (11:54 +0100)]
Merge remote-tracking branch 'origin/new/bug_7117'
Katrin Fischer [Mon, 24 Oct 2011 18:59:57 +0000 (20:59 +0200)]
Bug 6994: Wrong 'no budget defined' alert
When ordering from an existing record the 'no budgets and funds defined' error
message was shown below the result list.
To test:
A) No budgets defined for this user and library
Basket summary page shows a warning instead of the link for creation
of orders.
B) Budgets and funds are properly defined for this user and library
Basket summary page shows links for order creation.
Before patch: A search for an existing record had the alert at the bottom
of the search result list.
After patch: The links for creation of orders are shown instead.
Signed-off-by: Liz Rea <lrea@nekls.org>
Verified A and B.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Frédérick Capovilla [Wed, 5 Oct 2011 19:12:04 +0000 (15:12 -0400)]
Notify the user on his account page when his account is almost expired
New feature : If the "NotifyBorrowerDeparture" system preference is defined, a
notification appears in the user's account page if his subscription is almost
expired.
http://bugs.koha-community.org/show_bug.cgi?id=6978
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
works perfectly with date formatted DD/MM/YYYY as well
Ian Walls [Tue, 20 Sep 2011 13:22:46 +0000 (09:22 -0400)]
Bug 6471: add tablesorter to Holds Queue
This patch adds the table sorter to Holds Queue. Sponsored by Farmington Public Library.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Tue, 25 Oct 2011 14:16:02 +0000 (10:16 -0400)]
Fix for Bug 7085 - Problems with searching for orders in acquisitions
Changing "if ( defined $input )" to "if ( $input )" in the section
of the script which builds the order search query seems to give
successful searches where they didn't exist before. Searches from
the advanced order search screen work with title, author, vendor,
basket number, date, etc.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Searches for date ranges, title and author keywords give
me the correct results now.
Katrin Fischer [Mon, 31 Oct 2011 00:06:17 +0000 (01:06 +0100)]
Bug 7117: Bug 7117 - Small display problems when organising suggestion tabs by name
To test:
1) Add some suggestions
2) Go to suggestions in staff
3) Choose from filters 'suggested by' or 'managed by'
4) Compare names shown on tabs with names in list of suggestions
Before patch: tab name has the wrong order, while list name is correct.
After patch: all names should be consistent and correct.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Marcel de Rooy [Thu, 3 Nov 2011 12:41:24 +0000 (13:41 +0100)]
7146 (Update timestamps when deleting a biblio)
Currently, when you delete an item, the timestamp column in deleteditems is
updated with current time. (This comes from an [unintentional] additional
update statement in DelItem.) It makes deletion time visible.
In the past, the marcxml was updated too at that moment, resulting in an
updated timestamp in biblioitems too. The timestamp in biblio was not touched.
If you delete a biblio however, the timestamps in deletedbiblio and
deletedbiblioitems do not reflect time of deletion. They still show the time of
last update before the record was deleted. This last update can be extracted
from MARC field 005 too.
This behavior is not consistent nor logical. I would suggest to add a statement
in DelBiblio to force updating the timestamp in deletedbiblio(items) too. It
makes the time of deletion visible in the record too. The time of deletion of a
biblio can be very useful for e.g. synchronizing purposes.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Fri, 4 Nov 2011 18:56:50 +0000 (14:56 -0400)]
Follow-up fix for Bug 3958, Standardize vendor/supplier/bookseller terminology
Fixing two stray instances of "supplier."
Ian Walls [Wed, 19 Oct 2011 00:17:17 +0000 (20:17 -0400)]
Bug 7061: unnecessary global variables declared in C4::SQLHelper
Removes $tablename and $hash from global scope of C4/SQLHelper.pm. They are never used;
all instances of $table are locally scoped to the subroutines, and $hash is never used.
This may help with persistance; if not, it's at least a bit of trivial cleanup.
To test:
1. Search for a patron
2. Create a Contract in Acquisitions
3. Modify that Contract
4. Delete that Contract
All instances should return error free. This checks the subroutines of SQLHelper
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Frédéric Demians [Sat, 8 Oct 2011 13:30:59 +0000 (15:30 +0200)]
Bug 6989 Patron categories not properly displayed if not pure ASCII
C4::Category module returns badly encoded patron categories when they are
containing non pure-ASCII characters.
To reproduce this bug:
- Go in Administration > Patron Categories
- Add a new category. Give it this code for example:
Café
- Click on Patrons link on top menu
- Click on New button
=> You get 'Café' displayed without accent
Signed-off-by: Piotr Wejman <ropuch@bagno.be>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Wed, 15 Dec 2010 13:05:04 +0000 (14:05 +0100)]
Bug 5885 : UNIMARC XSLT changes
dealing with some BNF/SUDOC invalid utf-8 (in title, the removed fields are used to mark non-sorted words)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
I can't test this works ok for UNIMARC, but it does not cause any
problems with the translation scripts or MARC21 so signing off
Ian Walls [Fri, 21 Oct 2011 15:43:17 +0000 (11:43 -0400)]
Bug 7076: Lists render OPAC XSLT on staff side
Adds a small check in C4::VirtualShelves::Page::shelfpage to only render
OPACResultsXSLT if the $type is 'opac'. Since parsing the XML is such an expensive
thing, and the resulting XSLTBloc is not used on the staff side, this will increase
performance for Lists in the intranet
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Frédérick Capovilla [Mon, 17 Oct 2011 20:01:29 +0000 (16:01 -0400)]
Follow-up patch : use the subfield associated with items.barcode
Instead of using the 'p' subfield directly, use the subfield letter
associated with the items.barcode column.
http://bugs.koha-community.org/show_bug.cgi?id=6963
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test cases tested:
- 1 item, barcode empty
- 2 items, barcodes both empty
- 1 item, existing barcode
- 1 item, new barcode
- 2 items, one barcode empty, one existing
All test cases worked nicely and gave correct error messages.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Frédérick Capovilla [Mon, 3 Oct 2011 19:00:05 +0000 (15:00 -0400)]
Bug 6963: Corrects a problem when a new order is created with a duplicate barcode.
If the AcqCreateItem preference is set to "ordering" and the barcode for
the new item is already in use, no error is returned, but an invalid
itemnumber is saved in the aqorders_items table and the item is never
created.
This patch adds a duplicate barcode verification in neworderempty.pl
_koha_add_item is also modified so it won't return an invalid ID when
an item can't be added.
http://bugs.koha-community.org/show_bug.cgi?id=6963
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan on second patch.
Chris Cormack [Wed, 5 Oct 2011 03:39:08 +0000 (16:39 +1300)]
Bug 6895 : First attempt at fixing the diacritics bug
This is a fairly hacky solution, a counter patch would be more than
welcome
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Updated, translated and installed German po files after applying this patch.
No problems found.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Maxime Pelletier [Wed, 19 Oct 2011 19:28:16 +0000 (15:28 -0400)]
Bug 7069: Put strings in "" instead of '' to fix the javascript not working when the translated string has a ' in it.
http://bugs.koha-community.org/show_bug.cgi?id=7069
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch changes '' to "" to make it work for strings which contain '.
Patch does NOT add new strings to the po files.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Mon, 3 Oct 2011 12:59:18 +0000 (08:59 -0400)]
Fix for Bug 6955, Toolbar on reading history broken
Table sorter script causes error if there is no <tbody> to sort.
JS errors cause the YUI toolbar js to abort, causing the problem
observed. When there are no results the whole table should be
omitted and a message displayed in its place.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
- check toolbar on top of patron reading history with no entries
- check toolbar on top of patron reading history after a few checkouts
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Maxime Pelletier [Wed, 21 Sep 2011 18:15:39 +0000 (14:15 -0400)]
Use unitprice in neworder so that the value is saved in the database and so it will be the same field used as to receive shipments
http://bugs.koha-community.org/show_bug.cgi?id=6414
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed off with a note: this doesn't fix everything mentioned in the bug.
It also might clash with bug 4831 and should be tested with that patch.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Chris Cormack [Fri, 4 Nov 2011 06:46:45 +0000 (19:46 +1300)]
Sorry pushed this by mistake when trying to fix Pauls permissions
Revert "Fix for Bug 5974 - Bogus auth check for "StaffMember" role"
This reverts commit
a867bfcff7201a7fa3b56bee4dd484a49ece35e3.
Owen Leonard [Mon, 28 Mar 2011 18:08:00 +0000 (14:08 -0400)]
Fix for Bug 5974 - Bogus auth check for "StaffMember" role
Also removing some YAHOO.widget.Button declarations which
are redundant.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Fri, 21 Oct 2011 21:26:13 +0000 (10:26 +1300)]
Updating version number for release
Chris Cormack [Fri, 21 Oct 2011 21:24:05 +0000 (10:24 +1300)]
Release notes for 3.6.0
Chris Cormack [Fri, 21 Oct 2011 20:12:15 +0000 (09:12 +1300)]
Updating distro specific install files
Chris Cormack [Fri, 21 Oct 2011 20:04:19 +0000 (09:04 +1300)]
Updating main INSTALL instructions
Ian Walls [Fri, 21 Oct 2011 18:41:03 +0000 (14:41 -0400)]
Bug 7078: Remove HTML::Template::Pro from Koha perl dependencies list
Removes HTML::Template::Pro as a requirement (since we're now on Template::Toolkit).
To test:
On a system without, HTML::Template::Pro installed, run perl koha_perl_deps.pl -m -u
Shouldn't return anything about HTML::Template::Pro
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Ian Walls [Fri, 21 Oct 2011 18:16:51 +0000 (14:16 -0400)]
Bug 7063: add available perl packages for Debian in install_misc/debian.packages
Takes work done by Eduardo Trápani, alphabetizes, and adds two other packages:
libuniversal-require-perl
libgravatar-url-perl
From my testing, only CGI::Session::Driver::memcached remains missing; it is only
packaged for sid and wheezy at this time
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Fri, 21 Oct 2011 17:36:36 +0000 (06:36 +1300)]
Merge remote-tracking branch 'kc/new/bug_5995' into kcmaster
Conflicts:
opac/sco/sco-main.pl
Ian Walls [Tue, 18 Oct 2011 14:18:14 +0000 (10:18 -0400)]
Bug 5995 Follow up: variable scope in koha/sco/sco-main.pl
The patronid value (cardnumber) set by checkpw in the case of SelfCheckoutByLogin
was improperly scoped with 'my' inside a conditional. The changes followup to 5995
made this more apparent, causing logins to fail.
Also added "parts copyright" statement to the script, since ByWater Solutions did make some
significant contributions to the operations of the page
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>