Commit graph

5584 commits

Author SHA1 Message Date
d1dc3c0c2e Bug 7641 - Add ability to suspend reserves - Followup
* Switch from C4::Dates to $KohaDates
  * Fix 'Resume All Suspended All Requests'
  * Change button text to follow capitalization rules
  * Change 'requests' to 'holds'

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-06 17:23:10 +02:00
Paul Poulain
413a1e1e61 Merge remote-tracking branch 'origin/new/bug_7143' 2012-04-06 15:12:28 +02:00
Zeno Tajoli
7639cd89fb Italian translation teams
http://bugs.koha-community.org/show_bug.cgi?id=7143
2012-04-06 15:11:50 +02:00
69a13493b4 Bug 2780 - Capitalize strings consistently (Acquisitions pages)
Correcting capitalization on strings in Acquisitions templates

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:48 +02:00
9e72156f75 Bug 2780 - Capitalize strings consistently (miscellaneous)
Correcting all remaining includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:46 +02:00
d1593d3f7a Bug 2780 - Capitalize strings consistently (Tools)
Correcting Tools-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:45 +02:00
b03679ab4c Bug 2780 - Capitalize strings consistently (Reports)
Correcting Reports-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:43 +02:00
9315c9a808 Bug 2780 - Capitalize strings consistently (Administration)
Correcting System administration-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:41 +02:00
313e4288d3 Bug 2780 - Capitalize strings consistently (Cataloging)
Correcting Cataloging-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:40 +02:00
6f756d2342 Bug 2780 - Capitalize strings consistently (Serials)
Correcting Serials-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:38 +02:00
85592866ab Bug 2780 - Capitalize strings consistently (Patrons)
Correcting Patron-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:37 +02:00
5324908059 Bug 2780 - Capitalize strings consistently (Patron cards)
Correcting Patron card creator-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:35 +02:00
ad1ebc293a Bug 2780 - Capitalize strings consistently (Labels)
Correcting Labels-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:33 +02:00
0ffbbfd9d5 Bug 2780 - Capitalize strings consistently (Circulation)
Correcting Circulation-related includes

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:54:07 +02:00
4800a515c5 Bug 2780 - Capitalize strings consistently (Budgets)
Correcting Budgets-related includes.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:51:27 +02:00
1c8037e406 Bug 2780 - Capitalize strings consistently (catalog)
Correcting catalog-related includes.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:51:25 +02:00
b53c369ce8 Bug 2780 - Capitalize strings consistently
Corrections to Authorities-related includes.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:51:24 +02:00
3e358cb993 Bug 2780 - Capitalize strings consistently
Corrections to Acquisitions include files. Patch
also includes some corrections to unescaped ampersands.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-04 17:51:23 +02:00
Katrin Fischer
a3f1b8cb5e Bug 7864: Little changes to the display
Changes the display of subscribers a bit.

- Makes each name a link to the patron account instead of having a separate
  'View' link behind each name
- Show the title and subscrption number as link to the subscription detail
  page instead of just 'subscription'

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-04 10:58:36 +02:00
Katrin Fischer
b70a9f4554 Bug 7864: Reintroduce list of subscribers to a serial alert message
Adds a link to the existing template from the serial detail page:

Patron alert with: RLIST (subscribers)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-04 10:58:34 +02:00
Liz Rea
81d5f9dcda Bug 7888 - Permission for "change password" button in circ toolbar should be "borrowers" instead of "staffaccess"
Patch changes permisison for "change password" button in circ-toolbar.inc from staffaccess to borrowers.

To test:
- With a staff user with borrowers permission, verify the change password button is shown for a normal patron.
- With a staff user without borrowers permission, verify the change password button does not appear.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-04 10:55:48 +02:00
Jonathan Druart
d76dbace5e Bug 7291: Adds new field aqbooksellers.deliverytime
New field deliverytime in aqbooksellers table. It is an estimated
delivery time for orders (in days).
You can set this delay on the supplier modification page.
It is used in the late orders search.

The order estimated date is the aqbasket.closedate +
aqbooksellers.deliverytime

If you set a delay, the query check if closedate <= today - delay

If you set a "delivery time from" and a "delivery time to", the query check if
$delivery_time_from <= aqbooksellers.deliverytime is not NULL and if
closedate + deliverytime >= $delivery_time_to
if there is not a time_to then $delivery_time_to = the current date.
2012-04-03 18:19:46 +02:00
Adrien Saurat
b95a9d4500 Bug 7868: cleans logs when doing a Search on the intranet
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Amended the patch: combined if statements and added a check for pubshelves too.
2012-04-03 18:09:44 +02:00
Katrin Fischer
7d78c1236d Bug 1662: Is there a difference between Full and Simplified for Serials History
Changes description of system preference SubscriptionHistory:

When showing the subscription information for a bibliographic record,
preselect [brief history|full history] view of the serial issues.

To test:
1) Verify new description shows in system preference editor (tab serials)
2) Verify description is correct (OPAC > Subscription tab > more details)

Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-03 18:07:07 +02:00
Jonathan Druart
c5746fd2bf Bug 7836 - Poor English on Patron Attribute Form
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>
2012-04-02 11:37:54 +02:00
Dobrica Pavlinusic
f91bd36399 Bug 7821 - {langcode} will be replaced with current interface language
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>
2012-03-29 17:05:12 +02:00
Stéphane Delaune
df0a6a71d7 Bug 4032 XSLT systempreference takes a path to file rather than YesNo
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
2012-03-29 16:58:55 +02:00
eb3dc448d2 Bug 7835 - submit and cancel buttons on diff lines on notices
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>
2012-03-29 15:19:24 +02:00
f446b3d03d Bug 7641: Suspend Reserves
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.
2012-03-29 14:37:49 +02:00
Magnus Enger
448dbe2df5 Bug 7537 - Implement TraceCompleteSubfields, TraceSubjectSubdivisions and UseICU for NORMARC XSLT
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>
2012-03-29 11:00:32 +02:00
Katrin Fischer
8136a31f54 Bug 7823: [SIGNED-OFF] Ergonomy improvements: Rename button to "New patron"
"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>
2012-03-28 16:24:09 +02:00
Magnus Enger
c429c8d774 Bug 7695 - Change boolean operator from "and" to "AND"
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>
2012-03-28 16:23:26 +02:00
Jonathan Druart
a52d3fbf9d Bug 5354: Followup. Change separator 2012-03-28 15:56:45 +02:00
Jonathan Druart
5167e8034d Bug 5354: Partial duplication of a subscription
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>
2012-03-28 15:51:23 +02:00
fe03c32e22 Bug 7786 Adding More Lists-option to the Add-to combo of staff search results
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-28 15:48:18 +02:00
Paul Poulain
3de13a0f6d Merge remote-tracking branch 'origin/new/bug_7760' 2012-03-26 16:21:31 +02:00
Katrin Fischer
18149078e9 Bug 7760: More ids and classes for the staff interface
Owen pointed out that I missed 3 files - this corrects my omission.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-26 16:21:06 +02:00
Gaetan Boisson
1c6bb07f8a Bug 7761 - cleaning up empty declarations from staff-global.css
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 16:20:09 +02:00
Jonathan Druart
f35a1cce68 Bug 7470: Babeltheque integration
3 features:
- adds social network information in search results
- adds babeltheque data in opac-detail
- adds social network links in opac-detail too (google+, twitter, mail
  and co.)
2012-03-26 14:24:04 +02:00
Paul Poulain
1d882495c2 bug 7178 follow-up: typo fix
* words lower cased
* removed a space before :
2012-03-26 14:15:14 +02:00
Julian Maurice
eefc774e27 Bug 7178: Acquisition item creation improvement
- Display a unique item block at once

On orderreceive.pl when AcqCreateItem is 'receiving', and on
neworderempty.pl when AcqCreateItem is 'ordering' it displays an
item block with item infos to fill, and a '+' button.
When user clicks on '+', the block is hidden and a list shows up with
the items that will be received. User can then edit or delete items in
the list and click 'Save' to receive items.

- PrepareItemrecordDisplay is now used for cloning block

Previous cloning function was duplicating ids, the side effect is that
plugins didn't work when several items were displayed.
PrepareItemrecordDisplay regenerate the form with new ids

- New system preference UniqueItemFields

Contains a space-separated list of sql column names (of items table).
This syspref is used in two ways:
 - Values corresponding to fields in syspref are not duplicated when
   adding a new item (button 'Add')
 - When saving the form, a check is made on fields in syspref for
   detecting duplicate (in DB and in the form)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests done are noted on the bug report.

2012-03-23: Fixed conflict in updatedatabase.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 11:07:23 +02:00
Juan Romay Sieira
020c095377 Bug 7263 - Determine maximum length of some fields or subfields when cataloguing a biblio or an item.
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 10:51:22 +02:00
Paul Poulain
1474d95c10 Merge remote-tracking branch 'origin/new/bug_7548' 2012-03-23 10:24:19 +01:00
koha
c7256d3447 Bug 7548 Fix variable scoping in the template - Rebased
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-23 10:23:27 +01:00
Juan Romay Sieira
21b3f8a7bf Bug 6140 - Set a timeout to z3950 servers that could have network problems occasionally
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2012-03-22 18:22:02 +01:00
Katrin Fischer
e4c67372e4 Bug 7760 - Add ids and classes to every staff page to help with customization (reports, ...)
This is the last one - adding the classes and ids to the report module and
some template files for smaller moduls/functions.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 18:12:35 +01:00
Katrin Fischer
f8626343e2 Bug 7760 - Add ids and classes to every staff page to help with customization (patroncard, labels)
After talking to Owen we decided to use 2 classes for those modules. I decided on:

patroncard: tools, pcard
labels: tools, labels
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:33 +01:00
Katrin Fischer
d8f8b95f07 Bug 7760 - Add ids and classes to every staff page to help with customization (tools)
Prefix for ids and class is 'tools'

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:32 +01:00
Katrin Fischer
0f39b52048 Add ids and classes to every staff page to help with customization (serials)
http://bugs.koha-community.org/show_bug.cgi?id=7760
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:31 +01:00
Katrin Fischer
1fd4a1e8af Bug 7760 - Add ids and classes to every staff page to help with customization (patrons)
Class is 'pat' and ids start with 'pat_'.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:30 +01:00