If durations are calculated by subtraction they will use units
larger than those we care about and these are not convertable
to the smaller units we are attempting to enumerate
Use the appropriate delta methods to calculate theee fines
Adds a separate hours_between method to calendar
This should strictly be checking opening hours (of which
closed days are a special case) of the relevant branch
These need adding to branches
http://bugs.koha-community.org/show_bug.cgi?id=7852
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
QA comment: renamed "days_minus_grace" variable to "units_minus_grace"
Also added POD to _get_chargeable_units
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Changes: Marc21 support, 995 for items (Unimarc), authorities types for both
MARC's, many small field/subfield changes
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
It works, doesn't break anything, seems to be in Ukrainian/Russian (I can't
judge).
It's a huge patch (21M). That's why it's attached as a bz2 archive: so the
archive must be downloaded, decompressed, and then applied.
General remark: Adding this patch to Koha will increase substantially Koha git
repository size. It shows that non-code files (.po files, SQL files)
could/should be managed outside Koha core repository. See this discussion:
http://wiki.koha-community.org/wiki/Git_Splitting_and_Shrinking
Here is my test plan:
[1] Apply the patch on master
[2] Install ru-RU and uk-UA languages:
cd misc/translator
./translate ru-RU uk-UA
[3] re-create Koha DB:
DROP DATABASE koha;
CREATE DATABASE koha;
[4] Load Koha pro interface: get web installer
[5] Choose ru-RU language
[6] Everything is in Russian. Click blindly on button until reaching the
page where to choose Unimarc/Marc21.
[7] Choose Unimarc.
[8] Tick on everything to load all UNIMARC SQL files.
[9] All SQL are loaded without any error.
[10] Check Koha cataloguing.
[11] Go to [3] and choose Marc21 at step [7].
[12] Go to [3] and choose uk-UA at step [5].
[13] Go to [3] and choose uk-UA at step [5] and Marc21 at step [7].
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(Poor being subjective, being an en-NZ speaker, all the US
misspellings are poor to me :))
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Bareword "C4::Templates::_current_language" not allowed while "strict subs" in use at /home/oleonard/kohaclone/C4/XSLT.pm line 175.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Fixes the problem.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
This makes bug 4032 support multi-language Koha installation which is important
for some of Koha users.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) After update XSLT system preferences are set to 'default'. All views
(OPAC and staff, results and detail page) work and switching languages
selects the correct translated file.
2) Leaving empty works and normal views are used.
3) Putting in a single URL without placeholder works.
4) Putting in a URL with placeholder works. Created local directories
have to match the language codes.
NOTE: In order to make the URLs and patchs work, the Utils file needs to be
copied too.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
I am signing it off because it doesn't break anything and I will report
another bug for language issues described in my previous comment.
Removed MySQLism backquotes
Changing markup of cancel button to match standard Koha pattern.
Also correcting some invalid markup:
- unescaped ampersands
- invalid form action attributes
- improperly nested elements in <ol>
- invalid "for" on label
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Adds the ability to suspend reserves. The new system preference
AutoResumeSuspendedHolds enables the ability to set a date for
a suspended hold to automatically be resumed.
When a hold is suspended, it will continue to increase in priority
as the holds above it are fulfilled. If the first holds in line
to be filled are suspended, the first non-suspened hold in line
will be used when an item can fulfill a hold that has been placed.
http://bugs.koha-community.org/show_bug.cgi?id=7641
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested with the preference on and off:
1. placed several holds in the staff client
2. suspended some with a date
3. suspended some without a date
4. triggered hold message by checking in for hold with suspensions
5. the suspended hold was skipped as it should be
6. tested suspending holds in the OPAC w and w/out dates
7. ran the cron to clear suspensions with dates
All the above tests worked as expected. Signing off.
Probably due to bug 6875, C4::Letters is no longer used by C4::Serials, so that
when SendAlerts is called (exactly when this happens is a mystery to me), you
will get an error. Adding a "require C4::Letters;" and prefixing SendAlerts to
C4::Letters:: should fix it.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes the perl error. Steps to reproduce:
1) Create a subscription and set patron notification to "Routling list" -
this is necessary, so that a link to email notifications shows up in the OPAC.
2) Search for the serial record in the OPAC and click on the more details
view from the subscriptions tab. Subscribe to email notifications.
3) Go back into the serials module and receive and issue for the serial.
Before the patch a nasty perl error will be shown, after the patch
receiving works.
I couldn't confirm that the email was sent out with my setup, but this patch
certainly fixes serial receive.
[Update 2011-02-29] Fixed the typo and retested. Looks good, but couldn't check
if the mail was actually sent.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Add the option of sorting authority search results by authid, and instruct the
FirstMatch and LastMatch linkers to use that sort order rather than the default
search order.
To test:
1. Install new Zebra authorities config
etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml,
etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl,
etc/zebradb/marc_defs/marc21/authorities/record.abs, and
etc/zebradb/marc_defs/unimarc/authorities/record.abs
2. Reindex authorities in Zebra
3. Set LinkerModule to FirstMatch or LastMatch
4. Add two identical authority records, and a bib record with a heading that
matches them
5. Run misc/link_bibs_to_authorities.pl on that record
6. Confirm that the authid that's been inserted into subfield $9 of that
heading is the first, if you selected FirstMatch, or last if you selected
LastMatch
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I followed the test plan and checked that for "Last match" and "First match"
the correct authority was selected and linked to the record.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
IMPORTANT! This patch relies on the patch for Bug 7092, which is now pushed to
master.
As the title says, this patch implements TraceCompleteSubfields,
TraceSubjectSubdivisions and UseICU for NORMARC XSLT, both for the OPAC
and the Intranet. This affects how clickable subject-links are constructed.
To make this work the indexing of MARC fields in the 600 range is changed
to include "Subject:p" in several new places.
To test:
Find a record with a "complex" subject, like "Internet -- Law and legislation".
MARC21 and NORMARC are very similar in how they handle subjects, so testing
on a MARC21 database should be OK. (Changes in indexing reflect changes already
made to the MARC21 indexing.)
Make sure you have these syspref settings:
- marcflavour = NORMARC
- XSLTDetailsDisplay = using XSLT stylesheets
- OPACXSLTDetailsDisplay = using XSLT stylesheets
(Ideally, testing should be done on a real NORMARC setup, but since the changes
to indexing only reflect how it's already done in MARC21, I think testing
on a MARC21 installation with marcflavour = NORMARC should be OK.)
Now try the different combinations of TraceCompleteSubfields,
TraceSubjectSubdivisions and UseICU, and check the format of the
clickable links, both in the OPAC and staff client. Here's what you should
be seeing:
1.
TraceCompleteSubfields = Don't force
TraceSubjectSubdivisions = Don't include
UseICU = Not using
opac-search.pl?q=su:"Internet"
UseICU = Using
opac-search.pl?q=su:{Internet}
2.
TraceCompleteSubfields = Force
TraceSubjectSubdivisions = Don't include
UseICU = Not using
opac-search.pl?q=su,complete-subfield:"Internet"
UseICU = Using
opac-search.pl?q=su,complete-subfield:{Internet}
3.
TraceCompleteSubfields = Don't force
TraceSubjectSubdivisions = Include
UseICU = Not using
opac-search.pl?q=(su:"Internet") AND (su:"Law and legislation.")
UseICU = Using
opac-search.pl?q=(su:{Internet}) AND (su:{Law and legislation.})
4.
TraceCompleteSubfields = Force
TraceSubjectSubdivisions = Include
UseICU = Not using
opac-search.pl?q=(su,complete-subfield:"Internet") AND (su,complete-subfield:"Law and legislation.")
UseICU = Using
opac-search.pl?q=(su,complete-subfield:{Internet}) AND (su,complete-subfield:{Law and legislation.})
UPDATE 2012-03-23
- Change the syspref TracingQuotes to UseICU, see bug 7092
- Change boolean operator from "and" to "AND", see bug 7695
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Note: UseControlnumber must be turned off.
1) Works.
2) Works.
3) Works.
4) Works.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Set the rentalcharge = 0 for sample itemtypes (except Music for nb-NO).
To test:
Run through the web-installer for nb-NO and de-DE, and check that
itemtypes are displayed correctly for each language.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>.
Note: You have to install the language first in order to be able
to select it in the web installer. There was a problem
in the po files for nb-NO that kept all files from being created
correctly. I fixed the po file and did an installation with all sample
files. There is a problem with z3950servers.sql that is not caused
by this patch:
z3950servers.sql
ERROR 1136 (21S01) at line 1: Column count doesn't match value count at row 1
Web installer for de-DE ran without problems on the sample files.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Patch adds an unique id to every item tab and
to every column in the items table on the holdings tab.
http://bugs.koha-community.org/show_bug.cgi?id=4819
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Simple fix, a special case was added for the fast add framework
in the case that an item was being checked out that had not been
catalogued. In that case, the barcode was being passed as a parameter
through addbiblio.pl to additem.pl.
This barcode param was used to overwrite the existing value, so if
no barcode param was passed ( which is only the case with fast adds
from the circ screen ), the barcode field would appear empty in the
items editor.
This commit causes that special case code to check for an existing
barcode value first, and only use the cgi parameter 'branch' in the
case that there is no existing barcode value.
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Editing barcode of fast added item now works. Passes t xt
Recommend this for 3.6 release.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Add a tool to calculate static fine. For example, 7 days left = 1€ fixed fine
Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
This adds the -dedupbarcode option that allows bulkmarkimport to erase
a barcode but keep the item of any items it finds with duplicate
barcodes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
In Bug 7772 Ian correctly noted that reports have exit(1) all over the place.
This is left over from old code, and this patch changes them to exit(0).
I decided to use plain exit as opposed to explicit exit(0) since it produces
cleaner code, but I'm welcoming suggestion on this.
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
"New" for adding new patrons is hard to translate and is not consistent
with the naming of similar buttons in other parts of Koha.
Patch changes "New" to "New patron".
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Patch does what it says and ii makes sense to change the wording.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
When XSLTDetailsDisplay/OPACXSLTDetailsDisplay = on and
TraceSubjectSubdivisions = Include, subject sudivisions are
combined with the boolean operator "and". Currently, this word is
translated along with other occurrences of the same word, resulting
in a false "no records found" for users of non-English templates.
This patch replaces "and" with "AND" which should have no effect on
searching (since Zebra is case-insensitive in this regard) but will
make the boolean operator stand out from other uses of "and" in
translations.
TraceSubjectSubdivisions is currently only implemented in MARC21,
so UNIMARC and NORMARC is not affected.
To test:
XSLTDetailsDisplay/OPACXSLTDetailsDisplay = using XSLT
TraceSubjectSubdivisions = Include
marcflavour = MARC21
Find a record with a clickable subject that includes one or more
subdivisions and check that the subdivisions are combined with
"AND", not "and". Check that you get the expected result when
clicking on the subject.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Easy to test and works as advertised.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Fix installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql so it
includes column names.
To test:
- Install the nb-NO language
- Run through the web installer, and make sure to select the optional
("Valgfritt") z3950servers.sql file
- Check there are no errors
- Check that the Z39.50 errors are displayed OK in
Home › Administration › Z39.50 Servers
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Web installer runs without any errors now and I checked that
the Z39.50 servers were imported correctly and can be edited.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
With marcflavour = NORMARC and OPACXSLTDetailsDisplay = Using XSLT,
the detail view displays a double set of tabs for Normal/MARC/ISBD
views, one above the title and one below.
To test:
marcflavour = NORMARC
OPACXSLTDetailsDisplay = Using XSLT
Since the contents of the recaords do not matter here, the patch
can be tested on MARC records of any flavour.
- Check that double tabs are shown
- Apply the patch
- Check that only the set of tabs at the top is shown
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
I could not reproduce the working behaviour when I found that the tiny follow-up introduced a bug
| being a reserved char in regexp, split '|' is not splitting on '|' ! we must write '\|' !
A new syspref (SubscriptionDuplicateDroppedInput) contains the list of fields to
duplicate when duplicating a subscription. The library will be able to
define that, for example, the internal note should not be duplicated
Test plan:
On the detail subscription page, click Edit > Edit as New (Duplicate):
All the information must be copied from the original subscription.
Fill the syspref SubscriptionDuplicateDroppedInput with a list of fields
you don't want to be duplicated (e.g. location;notes;branchcode).
Repeat the duplicate action. Normally, information for these fields are
not copied.
Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
$uploaded_file is now scoped with our, and we set correct filename
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
duplicate_framework needs $dbh so we get it from C4::Context
Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
This fixes scope of $query and $nextexpected
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
transfer $template to add_matcher_list for correct scoping
and score $dbh and $runinbackground with our
Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
scoping fixes for Variable "*" is not available errors
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Replaces formattedwaitingdate with just waitingdate, since no longer create and export
that template variable
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
