Commit graph

15030 commits

Author SHA1 Message Date
Srdjan Jankovic
1713133fdd bug_5211: LostItem() - added charge_fee param to control fee charging
Pass charge_fee = yes wherever is LostItem() called, which effectively
means tha there's no change.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-06 11:36:34 +01:00
Paul Poulain
df80c6358c Bug 6015, new script for load testing
This benchmark_staff.pl script is based on the previous benchmark_circulation.pl script
As it does not test only circulation, the renaming was necessary.
The script has many enhancement compared to the benchmark_circulation.pl one
The benchmark_staff will run a benchmark on the following pages:
    * mainpage.pl
    * catalogue/detail.pl
    * catalogue/search.pl
    * members/member.pl (search on a name)
    * members/member.pl (search on a 1st letter)
    * circulation/circulation.pl and return.pl (check-out and check-in)
    * all those steps at the same time

    run the script without any parameter to get syntax
2011-12-02 17:39:13 +01:00
Paul Poulain
c7ef4da571 Revert "Fix for Bug 6291, Cart printing truncated in Firefox"
see
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6291, comment 7, 9 and http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7279

This reverts commit da0a5b2bd6.
2011-11-30 17:12:06 +01:00
Paul Poulain
87311ca00e Merge branch 'new/bug_6328' 2011-11-30 17:07:29 +01:00
Paul Poulain
384b9179e0 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
2011-11-30 17:07:07 +01:00
Paul Poulain
f0489763d6 Merge remote-tracking branch 'origin/new/bug_6894' 2011-11-28 12:20:58 +01:00
Paul Poulain
c95cbce4ce 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)
2011-11-28 12:13:42 +01:00
Chris Cormack
66fa828846 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.
2011-11-28 11:22:06 +01:00
Katrin Fischer
624b1562d8 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>
2011-11-28 10:22:04 +01:00
Paul Poulain
339e9edd14 Merge branch 'new/bug_6328' 2011-11-28 10:12:23 +01:00
Chris Cormack
3e05393dd8 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.
2011-11-28 10:11:46 +01:00
Chris Cormack
8664d19567 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 !
2011-11-28 10:05:58 +01:00
Paul Poulain
2989e12288 Merge branch 'new/bug_6629' 2011-11-28 09:46:23 +01:00
Chris Cormack
af205cb50a 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>
2011-11-28 09:45:50 +01:00
Chris Cormack
948f65344e 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.
2011-11-28 09:44:34 +01:00
Paul Poulain
6323bb081e Merge remote-tracking branch 'origin/new/bug_7250' 2011-11-25 14:29:04 +01:00
Katrin Fischer
1b49f54b88 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>
2011-11-25 14:26:32 +01:00
Colin Campbell
4f49dc5ad0 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
2011-11-25 14:17:58 +01:00
Paul Poulain
1f6ae97375 bug 6328: updatedatabase bump 2011-11-25 14:09:06 +01:00
Paul Poulain
d019b4c63a 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)
2011-11-25 14:00:47 +01:00
Paul Poulain
41b42dbe32 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
2011-11-25 14:00:47 +01:00
Paul Poulain
1fe3514c3c 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>
2011-11-25 14:00:47 +01:00
Paul Poulain
ed9e0bf41e Merge remote-tracking branch 'origin/new/bug_5974' 2011-11-25 13:59:25 +01:00
Paul Poulain
eefa6147a2 follow-up: trailing " that makes T::T fail 2011-11-25 13:58:48 +01:00
Paul Poulain
c0e1984981 Merge remote-tracking branch 'origin/new/bug_3388' 2011-11-25 11:43:04 +01:00
Katrin Fischer
573b9275a6 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>
2011-11-25 11:07:11 +01:00
Chris Cormack
9a4e9e54f2 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
2011-11-25 10:56:04 +01:00
fd949453e8 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>
2011-11-24 15:15:18 +01:00
Chris Cormack
40bd14e0ea Bug 4330: Missing License Statement
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
2011-11-24 14:15:57 +01:00
Chris Cormack
93d4c90a68 Bug 4330: Wrong address for Free Software Foundation
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
2011-11-24 14:15:55 +01:00
f1d46529f9 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>
2011-11-24 14:10:13 +01:00
Colin Campbell
862b6ee90d 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>
2011-11-24 13:45:13 +01:00
Robin Sheat
0fd451060e 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>
2011-11-24 11:47:45 +01:00
Robin Sheat
03dffd8374 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>
2011-11-24 11:47:04 +01:00
Ian Walls
f56e6c0a58 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>
2011-11-24 11:44:02 +01:00
Srdjan Jankovic
2b2e544f05 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>
2011-11-24 11:30:08 +01:00
Paul Poulain
5c2def5158 Merge branch 'new/enh/bug_4877' 2011-11-24 10:48:14 +01:00
Magnus Enger
fab2d8b0ab 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
2011-11-24 10:47:33 +01:00
Chris Cormack
fda4af9a3e Bug 7242 : Fixing typo in a div
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-11-24 10:28:45 +01:00
4ce57a102b 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>
2011-11-18 23:29:08 +01:00
Paul Poulain
9c5d3ea3aa Joy nelson was already in history.txt, removing the entry 2011-11-18 23:28:38 +01:00
bfe06ef399 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>
2011-11-18 23:12:26 +01:00
Ian Walls
440c0f21ee 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>
2011-11-18 22:59:11 +01:00
Chris Nighswonger
a340ded2ca 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>
2011-11-18 22:51:28 +01:00
Frédérick Capovilla
6dac7273fb 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>
2011-11-18 22:45:45 +01:00
Salvador Zaragoza Rubio
042f89e939 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>
2011-11-18 22:32:35 +01:00
Liz Rea
1d42be9e76 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>
2011-11-17 17:27:59 +01:00
Katrin Fischer
c1d824deaa 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>
2011-11-17 17:12:38 +01:00
Frédérick Capovilla
8fde30912e 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
2011-11-17 17:08:21 +01:00
Robin Sheat
e7251f73a2 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>
2011-11-17 17:05:17 +01:00