koha.git
8 years agoMerge remote-tracking branch 'kc/master' into merged_5549
Chris Cormack [Wed, 21 Mar 2012 20:36:55 +0000 (09:36 +1300)]
Merge remote-tracking branch 'kc/master' into merged_5549

Fixed conflicts

Conflicts:
catalogue/moredetail.pl
installer/data/mysql/updatedatabase.pl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt

8 years agoBug 5549 Followup: fix suspension in days
Ian Walls [Wed, 21 Mar 2012 20:03:32 +0000 (16:03 -0400)]
Bug 5549 Followup: fix suspension in days

ISO dates were being compared with DateTime objects, and DateTime::Durations
with integers.  This patch reimplements the _FixFineDaysOnReturn subroutine
to use the new hourly loans functionality.

Also moves date formatting of patron debar date out of circ/returns.pl and into
KohaDates on the template

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 5549 : fixed undefined subroutine format_date in circ/returns.pl by adding full...
root [Wed, 21 Mar 2012 10:57:10 +0000 (05:57 -0500)]
Bug 5549 : fixed undefined subroutine format_date in circ/returns.pl by adding full path of C4::Dates::format_date()

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 7748: use of TT date filter on addorderiso2709
Adrien Saurat [Mon, 19 Mar 2012 16:10:16 +0000 (17:10 +0100)]
Bug 7748: use of TT date filter on addorderiso2709

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoSinglebranchmode was always 0 causing the branch to be null and the reservations...
Maxime Pelletier [Wed, 22 Feb 2012 17:00:28 +0000 (12:00 -0500)]
Singlebranchmode was always 0 causing the branch to be null and the reservations in the OPAC not to work in singlebranchmode.

Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
http://bugs.koha-community.org/show_bug.cgi?id=7581
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7169: Follow-up: Change booksellers search results display
Julian Maurice [Thu, 1 Mar 2012 08:46:49 +0000 (09:46 +0100)]
Bug 7169: Follow-up: Change booksellers search results display

- List of booksellers changed to a drop-down list
- Baskets columns renamed and reordered to make them consistent with
  acqui/parcels.pl
- warning in log removed
- changed a '&' to '&amp;' to pass W3 validator

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7169: Change booksellers search results display
Julian Maurice [Fri, 13 Jan 2012 11:11:49 +0000 (12:11 +0100)]
Bug 7169: Change booksellers search results display

- Replace vendor table by a div (avoid table in a table)
- Add two columns in basket tables: biblio count and expected (not
  received) items)
- Replace tablesorter by datatables
- Add a list of all returned bookseller names in top of the page (easier
  to find a bookseller in a large list of results)

8 years agoBug 7597 - Part 5 - Remove my from $branch, which was masking previous declaration
Kyle M Hall [Thu, 8 Mar 2012 19:35:08 +0000 (14:35 -0500)]
Bug 7597 - Part 5 - Remove my from $branch, which was masking previous declaration

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7597 - Part 4 - Change C4::Acounts::WriteOff to WriteOffFee
Kyle M Hall [Mon, 5 Mar 2012 20:29:44 +0000 (15:29 -0500)]
Bug 7597 - Part 4 - Change C4::Acounts::WriteOff to WriteOffFee

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
8 years agoBug 7597 - Part 3 - fines not recording the right info in the stats table
Kyle M Hall [Tue, 28 Feb 2012 14:34:59 +0000 (09:34 -0500)]
Bug 7597 - Part 3 - fines not recording the right info in the stats table

This commit fixes writeoff_all to write off only the amount outstanding
for each fine being written off, rather than the original amount owed.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested all three patches together and was able to write off single
and multiple fines and the data was correct in the stats table.

8 years agoBug 7597 - Part 2 - move sub writeoff to C4::Accounts
Kyle M Hall [Tue, 28 Feb 2012 14:17:04 +0000 (09:17 -0500)]
Bug 7597 - Part 2 - move sub writeoff to C4::Accounts

Currently, the subroutine writeoff lives in pay.pl, which
is a violation of the Koha coding guidelines, as it writes
to the database. This commit restructures and moves writeoff
to C4::Accounts::WriteOff(), and modifies pay.pl to use it.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested all three patches together and was able to write off single
and multiple fines and the data was correct in the stats table.

8 years agoBug 7597 - Part 1 - fines not recording the right info in the stats table
Kyle M Hall [Tue, 28 Feb 2012 13:47:43 +0000 (08:47 -0500)]
Bug 7597 - Part 1 - fines not recording the right info in the stats table

Koha was writing off the value of accountlines.amount rather
than the value of accountlines.ammountoutstanding.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested all three patches together and was able to write off single
and multiple fines and the data was correct in the stats table.

8 years agoBug 7310 follow-up: DBRev
Paul Poulain [Wed, 21 Mar 2012 16:06:04 +0000 (17:06 +0100)]
Bug 7310 follow-up: DBRev

8 years agoBug 7310 Followup: Warnings for nothingdeleted and somedeleted for staff client.
Marcel de Rooy [Thu, 23 Feb 2012 13:36:54 +0000 (14:36 +0100)]
Bug 7310 Followup: Warnings for nothingdeleted and somedeleted for staff client.

Test this patch by trying to delete items from a public list that someone else created (so you do not have sufficient permissions). Check the warning.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
8 years ago7310 Indentation followup replacing leading tabs with spaces
Marcel de Rooy [Mon, 27 Feb 2012 20:28:46 +0000 (21:28 +0100)]
7310 Indentation followup replacing leading tabs with spaces

March 5, 2012: Rebased for pushed 4912 patch.

Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
8 years agoBug 7310 Followup for sysprefs.sql
Marcel de Rooy [Thu, 1 Mar 2012 07:19:58 +0000 (08:19 +0100)]
Bug 7310 Followup for sysprefs.sql

Resolving the omission to add the prefs to sysprefs.sql.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested it separately by running the sql file on a new db.

March 19: Rebased.
March 21: Rebased.

8 years agoBug 7310: Updated VirtualShelves unit test
Marcel de Rooy [Mon, 20 Feb 2012 09:53:25 +0000 (10:53 +0100)]
Bug 7310: Updated VirtualShelves unit test

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
8 years agoBug 7310: Improving list permissions: Deleting patron
Marcel de Rooy [Mon, 13 Feb 2012 11:14:18 +0000 (12:14 +0100)]
Bug 7310: Improving list permissions: Deleting patron

Implements following points from the wiki page List permissions:
5) Delete or move list information when deleting a patron.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
8 years agoBug 7310: Code changes for Improving list permissions
Marcel de Rooy [Thu, 15 Dec 2011 12:19:01 +0000 (13:19 +0100)]
Bug 7310: Code changes for Improving list permissions

This lays the foundation for further changes for report 7310.
Implements following points from the wiki page List permissions:
1) Preference that controls if users may create public lists in opac.
2) New add/delete own/delete other permissions per list.

Code has been changed (in some cases refactored). New permissions are not yet visible; with this patch current functionality is kept as much as possible while resolving several issues, improving permissions and extending the code for further developments (using the new permissions and sharing lists).

Feb 23, 2012 (revision): Changed defaults for new lists. Could also remove routine GetRecentShelves by using GetSomeShelfNames in catalogue/search.pl just as opac-search.pl already did. (More consistent.)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Feb 29, 2012: Automerge version.
March 5, 2012: Rebase for pushed 4912 patch.
March 21, 2012: Rebased. Resolving some conflicts in relation to pushed report 7719.

8 years ago7310a: Improving list permissions: Changing Koha SQL structure
Marcel de Rooy [Thu, 8 Dec 2011 15:10:57 +0000 (16:10 +0100)]
7310a: Improving list permissions: Changing Koha SQL structure

Modifying Koha structure for improving list permissions.
Adds new table virtualshelfshares for maintaining shared private lists.
Adds three columns to virtualshelves for permissions per list.
Adds column borrowernumber to virtualshelfcontents.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Feb 28, 2012: Added three FK constraints for QA (for owner/borrowernumber in virtualshelves, shelfcontents and shelfshares). Resolved syntax error with a comment. Tested the install.
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
8 years agoBug 7310: Improving lists permissions -- New prefs
Marcel de Rooy [Thu, 16 Feb 2012 11:07:55 +0000 (12:07 +0100)]
Bug 7310: Improving lists permissions -- New prefs

Adds two new preferences to OPAC/Policy tab.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
8 years agoBug 7310: DB revision for Improving list permissions
Marcel de Rooy [Thu, 8 Dec 2011 15:10:57 +0000 (16:10 +0100)]
Bug 7310: DB revision for Improving list permissions

DB revision for improving list permissions.
Adds new table virtualshelfshares for maintaining shared private lists.
Adds three columns to virtualshelves for permissions per list.
Adds column borrowernumber to virtualshelfcontents.

Feb 16, 2012: Rebased.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Feb 28, 2012: Added three FK constraints for QA (for owner/borrowernumber in virtualshelves, shelfcontents and shelfshares). Tested update again.
Also removed the note about public lists, made obsolete by earlier adjustments for comments from Owen.
Feb 29, 2012: Rebased. Added an update statement to replace invalid borrowernumbers with null in virtualshelves before adding constraint and added a delete statement for private lists without owner now (as a result of the first step). Tested it again.
March 5, 2012: Rebased.
March 19: Rebased.
March 21: Rebased.

8 years agobug 7092 follow-up: DBRev number
Paul Poulain [Wed, 21 Mar 2012 13:53:37 +0000 (14:53 +0100)]
bug 7092 follow-up: DBRev number

8 years agoBug 7092 - Complete-subfield searches TraceCompleteSubfields syspref not working...
Magnus Enger [Mon, 5 Mar 2012 12:36:43 +0000 (13:36 +0100)]
Bug 7092 - Complete-subfield searches TraceCompleteSubfields syspref not working correctly

This patch adds a syspref UseICU for toggling between using "" and {} for
quoting in subject tracings. With normal Zebra indexing, "" must be used. With
ICU Zebra indexing, {} must be used.

This syspref interacts with TraceCompleteSubfields and TraceSubjectSubdivisions.

To test:

- marcflavour = MARC21
- make sure you have a record with a "complex subject", like
  "Internet -- Law and legislation"

Toggle UseICU, TraceCompleteSubfields, and TraceSubjectSubdivisions and check
that you get the expected results for the clickable links in the OPAC detail
view:

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}

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}

TraceCompleteSubfields   = Don't force
TraceSubjectSubdivisions = Include
UsingICU                 = Not using
  opac-search.pl?q=(su:"Internet") and (su:"Law and legislation.")
UsingICU                 = Using
  opac-search.pl?q=(su:{Internet}) and (su:{Law and legislation.})

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.})

Check that clicking on the generated links gives the expected search results,
but with normal and ICU indexing. (I have actually not tested this with ICU, so
doing that before signing off is crucial.)

UPDATE 2012-03-16:

Changed the name of the syspref from TracingQuotes to UseICU after a suggestion
from Paul P., to make it more generally useful.

I have used "Using/Not using" instead of "Use/Don't use" in the description of
the syspref, to reflect the fact that this syspref will not change how Zebra
does its indexing - it's just a way of telling Koha how the indexing is
actually done.

I have also set UseICU = 1 in updatedatabase.pl, since that will preserve the
current behaviour of Koha, but UseICU = 0 in sysprefs.sql, since most new
installations will not have ICU activated.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 7734: NO_LIBRARY_SET should be translatable
Katrin Fischer [Mon, 19 Mar 2012 13:38:30 +0000 (14:38 +0100)]
Bug 7734: NO_LIBRARY_SET should be translatable

To test:
- Make sure you are logged into Koha as 'root' user - not superlibrarian
- Before the patch the label will show 'NO_LIBRARY_SET', after applying
  the patch it will be 'NO LIBRARY SET' without underscores.
- Verify correct description is shown after selecting a library.

Signed-off-by: mveron <veron@veron.ch>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7744: use of TT date filters on basket pages
Adrien Saurat [Mon, 19 Mar 2012 15:02:15 +0000 (16:02 +0100)]
Bug 7744: use of TT date filters on basket pages

TT date filters added on basket.pl and neworderempty.pl

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7749: Not all OKs on the start page are translatable
Katrin Fischer [Mon, 19 Mar 2012 17:10:10 +0000 (18:10 +0100)]
Bug 7749: Not all OKs on the start page are translatable

I don't really understand, why the " OK " would not get picked up by
the translation script, but removing the spaces made it work.

To test:
Verify that all OK buttons on the start page are translatable. The one
resisting translation was "Search catalog:"

Signed-off-by: mveron <veron@veron.ch>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 6027 - Delete biblios if deleting all their items in batch deletion
Kyle M Hall [Fri, 17 Feb 2012 14:36:38 +0000 (09:36 -0500)]
Bug 6027 - Delete biblios if deleting all their items in batch deletion

Optionally delete bibliographic record when batch deleting items, if no items remain on the record.

Adds deleting of reserves to DelBiblio. Since subscriptions are deleted automatically,
it made sense for deletion of reserves to maintain the same behavior.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
I like the way this works, and it does. Passes tests.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 6831 follow-up: add support for UNIMARC and NORMARC
Katrin Fischer [Sun, 11 Mar 2012 19:00:39 +0000 (20:00 +0100)]
Bug 6831 follow-up: add support for UNIMARC and NORMARC

1) Removes unused subroutine get_host_control_num
2) Fixes small mistake, correct subfield for ISBN 020 is z
3) Checks system preference for correct marcflavour instead of
   assuming MARC21
4) Fixes MARC21 to not use author(), because it would also add
   fields like $w and $0 to 773$a
5) Fixes MARC21 to not use title(), but 245$a, because it would
   also add too many subfields.
6) Adds definitions for UNIMARC and includes NORMARC

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Works properly with all supported MARC flavours.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 6831: Add ability to enter adding child record from parent
Colin Campbell [Thu, 1 Sep 2011 15:18:14 +0000 (16:18 +0100)]
Bug 6831: Add ability to enter adding child record from parent

Simplifies the adding of analytical records and ensures that
the data populating the 773 tag is correct. From the host record
add child record is selected and create bib is entered to generate
a new record with host item tag populated from the parent

Caveat: currently prepare_host_field only returns a field for
MARC21. Values for UNIMARC and NORMARC can easily be added but
should be done by someone familar with those formats
and conventions

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
- create a new record
--> if you enter a value in 001 anaytics will use that in $w for linking later
--> if you set 000/LDR 19 - Multipart resource record level to 'a' there will
be a link from the parent record to the child record later
- save your record and go to the staff detail page
- in toolbar select 'New' > 'New child record'
- check field 773, 245 and 001 from the parent record should have been copied there
- check links between child and parent in staff

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed conflicts in all 3 files.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Works properly for MARC21, and follow-up adds support for NORMARC and UNIMARC.

8 years agoBug 5657: Changes made to sub merge to eliminate errors occuring when updating bibio...
Janusz Kaczmarek [Tue, 25 Jan 2011 17:10:00 +0000 (18:10 +0100)]
Bug 5657: Changes made to sub merge to eliminate errors occuring when updating bibio records in batch (after updating multiple authority records)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7144 string follow-up: reordering text
Paul Poulain [Wed, 21 Mar 2012 10:02:01 +0000 (11:02 +0100)]
Bug 7144 string follow-up: reordering text

the table below show checkout/hold/return, so the description should be in the same order for a better consistency

Plus the term "return" is used elsewhere in the page, so s/checkin/return/

8 years agoBug 7144 followup DBrev number
Paul Poulain [Wed, 21 Mar 2012 09:40:16 +0000 (10:40 +0100)]
Bug 7144 followup DBrev number

8 years agoBug 7144 follow-up cleaning for HTML4 coding guideline
Paul Poulain [Mon, 27 Feb 2012 13:11:56 +0000 (14:11 +0100)]
Bug 7144 follow-up cleaning for HTML4 coding guideline

http://wiki.koha-community.org/wiki/Coding_Guidelines#Upper_and_Lower_cases_in_strings
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoEnhancement 7144: Floating Collections (per branch/itemtype)
Ian Walls [Mon, 12 Dec 2011 17:15:35 +0000 (12:15 -0500)]
Enhancement 7144: Floating Collections (per branch/itemtype)

Adds support for Floating Collections (i.e. items that don't automatically return
home when checked in at another branch) on a per branchcode/itemtype basis.

This patch adds a new column (returnbranch) to the default_circ_rules, default_branch_item_rules,
default_branch_circ_rules and branch_item_rules tables, after the 'holdsallowed' column.  While
this is coded as a varchar(15), the only currently supported values are 'homebranch', 'holdingbranch',
'noreturn' and NULL.

On upgrade, the value of HomeOrHoldingBranchReturn is used to populate the global default (which is
stored in default_circ_rules.returnbranch).

To access this value, use C4::Circulation::GetBranchItemRule.  This subroutine is altered to supply
an additional key, "returnbranch", containing this value (or 'homebranch' as a default).  No existing
usage of GetBranchItemRule should need to be modified.

The use of HomeOrHoldingBranchReturn is removed in AddReturn to instead use this subroutine.  This will
determine, on a more granular level, where the item should be transferred, after all is said and done.  If
'noreturn' is specified, then the material will remain at the branch doing the checking in.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Passes prove t xt t/db_dependent

I was able to make this feature work as advertised.
As noted above, if you want a floating rule applied across all branches, adding a single default rule won't suffice, you'll need to add the rule to all branches. That issue is not related to the functioning of *this* patch however.

8 years agoBug 5549 : _FixFineDaysOnReturn was using C4::Dates in calling
Chris Cormack [Tue, 20 Mar 2012 22:09:51 +0000 (11:09 +1300)]
Bug 5549 :  _FixFineDaysOnReturn was using C4::Dates in calling
days_between, fixed to use DateTime objects

8 years agoBug 5549 : Fixing typo in C4/Circulation.pm
Chris Cormack [Tue, 20 Mar 2012 19:33:26 +0000 (08:33 +1300)]
Bug 5549 : Fixing typo in C4/Circulation.pm

days_between not daysBetween

8 years agoBug 7735: removal of C4::Dates when unused
Adrien Saurat [Mon, 19 Mar 2012 13:16:47 +0000 (14:16 +0100)]
Bug 7735: removal of C4::Dates when unused

Removes use of C4::Dates in acqui/ordered.pl and acqui/spent.pl

Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 6025: Adds a script that re-create missing statistics from issues and old_issues...
Matthias Meusburger [Tue, 25 May 2010 13:36:36 +0000 (15:36 +0200)]
Bug 6025: Adds a script that re-create missing statistics from issues and old_issues tables

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7600: Return a single-pixel GIF when no local cover image exists
Jared Camins-Esakov [Thu, 8 Mar 2012 03:13:34 +0000 (22:13 -0500)]
Bug 7600: Return a single-pixel GIF when no local cover image exists

Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7697: Remove unused textmessaging parameter from OPAC main/user
Ian Walls [Sat, 10 Mar 2012 17:04:20 +0000 (12:04 -0500)]
Bug 7697: Remove unused textmessaging parameter from OPAC main/user

Removes the textmessaging parameter from opac/opac-main.pl and
opac/opac-user.pl, since it's not utilized anywhere in the templates, and is
sourced from a field that no longer exists in the borrower
table (textmessaging).

This also removes a dependency on C4/Members.pm from opac-main.pl

To Test:  Login to the OPAC, and view both opac-user.pl and opac-main.pl. Both
pages should still render properly.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7166: Adds edit order notes when the basket is closed
Jonathan Druart [Mon, 19 Mar 2012 14:50:01 +0000 (15:50 +0100)]
Bug 7166: Adds edit order notes when the basket is closed

 When you are on parcel.pl or basket.pl you can now add or edit a note
 for each order.

 To test:
 Create orders with and without note.
 Edit/Add the note on basket.pl page

 Close the basket.
 Check you can add/edit the order note on parcel.pl page

+ From Owen:
Correcting markup issues with modordernotes.pl:

- Adding "rows" and "cols" attributes to <textarea> (required)
- Converting cancel button to link to stay consistent with
  other pages
- Changing page layout to fixed & centered (not sidebar needed)
- Expanding information in breadcrumbs to match information
  on basket.pl

Changing markup around note add and edit links: Moving output
of order note to the end of the table cell, putting it in its
own paragraph, and adding a "Note:" label

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7235 follow-up: removing some upper cases
Paul Poulain [Tue, 20 Mar 2012 15:43:01 +0000 (16:43 +0100)]
Bug 7235 follow-up: removing some upper cases

(see coding guidelines : Add Item => Add item)

8 years agoBug 7235: Add order date and checks for permissions
Katrin Fischer [Sun, 19 Feb 2012 23:12:13 +0000 (00:12 +0100)]
Bug 7235: Add order date and checks for permissions

- Adds order date above vendor
- Reordered fields to reflect history of the item
- Order information (order date, vendor) is only shown, when an order exists
- Accession date is only linked, when item was received in acquisition
- Links to basket and invoice are only shown when user has the correct permission
  - order date: manage_order
  - accession date: receive_shipment for invoice
- Changes all dates to use the KohaDates TT plugin
- Corrects display of rental price, removing additional zeros

To test:
1) Create a record with
- 1 item created in cataloguing
- 1 item ordered
- 1 item ordered and received
- 1 item checked out
2) Verify the correct information is shown for each
3) Verify links on the dates work correctly
4) Toggle permissions for the user

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Followed the test plan and all tests pass.

Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
changed supplierid to booksellerid

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7235: Adding invoice number and vendor name to the moredetail page
Srdjan Jankovic [Tue, 20 Dec 2011 05:39:24 +0000 (18:39 +1300)]
Bug 7235: Adding invoice number and vendor name to the moredetail page

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
8 years agowelcome gaetan, you're 179th !
Paul Poulain [Tue, 20 Mar 2012 14:58:50 +0000 (15:58 +0100)]
welcome gaetan, you're 179th !

8 years agoBug 7731 - Library should be used instead of branch and site
Gaetan Boisson [Mon, 19 Mar 2012 14:51:39 +0000 (15:51 +0100)]
Bug 7731 - Library should be used instead of branch and site

standardized the use of the term "library" instead of "Branch" accross the interface and opac

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoMerge remote-tracking branch 'origin/new/bug_7408'
Paul Poulain [Tue, 20 Mar 2012 14:03:15 +0000 (15:03 +0100)]
Merge remote-tracking branch 'origin/new/bug_7408'

Conflicts:
installer/data/mysql/sysprefs.sql

8 years agoBug 7408 : Fixing a typo that was breaking the installer
Chris Cormack [Tue, 20 Mar 2012 01:19:31 +0000 (14:19 +1300)]
Bug 7408 : Fixing a typo that was breaking the installer

Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
8 years agoMerge remote-tracking branch 'origin/new/bug_8250'
Paul Poulain [Tue, 20 Mar 2012 13:54:10 +0000 (14:54 +0100)]
Merge remote-tracking branch 'origin/new/bug_8250'

8 years agobug 7086 follow-up: removed warn
Paul Poulain [Tue, 20 Mar 2012 12:48:33 +0000 (13:48 +0100)]
bug 7086 follow-up: removed warn

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agobug 7086 follow-up: removed warn
Paul Poulain [Tue, 20 Mar 2012 12:48:33 +0000 (13:48 +0100)]
bug 7086 follow-up: removed warn

8 years agoBug 7086 : "suggested by" fixed for staff members
Adrien Saurat [Thu, 15 Mar 2012 13:59:24 +0000 (14:59 +0100)]
Bug 7086 : "suggested by" fixed for staff members

Now:
- suggested by is stored when a staff member makes a suggestion
- managed by is only updated when a suggestion is edited (not when
it is created)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7434: Display of issue number for serials in overdues
Adrien Saurat [Mon, 12 Mar 2012 15:34:34 +0000 (16:34 +0100)]
Bug 7434: Display of issue number for serials in overdues

items.enumchron is now displayed when not null

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7719 - Change state of controls based on whether boxes are checked
Owen Leonard [Fri, 30 Dec 2011 20:27:01 +0000 (15:27 -0500)]
Bug 7719 - Change state of controls based on whether boxes are checked

Some OPAC interface controls cannot function unless a checkbox is
checked. Examples:

- Placing a hold on multiple items in the cart window or on a list view page
- Adding tags to multiple items in the cart window or on a list view page
- Removing one or more items from the cart window
- Removing one or more items from a list on the list view page
- Adding one or more items to a list from the cart window

This patch moves these controls into a separate div in which links
are enabled or disabled based on whether checkboxes are checked. It
does so on two pages: The lists view page (when viewing the contents
of a list) and in the cart window.

Links which are in their disabled state should not perform any action.
After checking one or more checkboxes the links should become active
and behave normally.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Works in chrome and firefox (latest). Passes tests.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 6440: Implement OAI-PMH Sets
Julian Maurice [Mon, 23 Jan 2012 15:25:51 +0000 (16:25 +0100)]
Bug 6440: Implement OAI-PMH Sets

New sql tables:
  - oai_sets: contains the list of sets, described by a spec and a name
  - oai_sets_descriptions: contains a list of descriptions for each set
  - oai_sets_mappings: conditions on marc fields to match for biblio to be
    in a set
  - oai_sets_biblios: list of biblionumbers for each set

New admin page: allow to configure sets:
  - Creation, deletion, modification of spec, name and descriptions
  - Define mappings which will be used for building oai sets

Implements OAI Sets in opac/oai.pl:
  - ListSets, ListIdentifiers, ListRecords, GetRecord

New script misc/migration_tools/build_oai_sets.pl:
  - Retrieve marcxml from all biblios and test if they belong to defined
    sets. The oai_sets_biblios table is then updated accordingly

New system preference OAI-PMH:AutoUpdateSets. If on, update sets
automatically when a biblio is created or updated.

Use OPACBaseURL in oai_dc xslt

8 years agoBug 7696 - NORMARC lacks staff results XSLT
Magnus Enger [Thu, 15 Mar 2012 19:10:47 +0000 (20:10 +0100)]
Bug 7696 - NORMARC lacks staff results XSLT

This patch adds NORMARCslim2intranetResults.xsl, to enable XSLT display
of intreanet search results when marcflavour = NORMARC. Most of the
logic is copied verbatim from NORMARCslim2OPACResults.xsl.

To test:

Make sure you have these system preferences set:
marcflavour = NORMARC
XSLTResultsDisplay  = using XSLT stylesheet

NORMARC and MARC21 is similar enough that testing on MARC21 records should
be OK. (I don't expect anyone to do detailed testing of a lot of the different
positions in leader, 007, 008 etc...)

Before the patch: viewing results in the staff client should give an error
message about a missing XSLT file.

After the patch: Record details should be displayed in the search results,
similar to how it is done for MARC21.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7526 - longoverdue.pl leaves items marked as lost as still checked out to patron
Kyle M Hall [Fri, 10 Feb 2012 15:12:20 +0000 (10:12 -0500)]
Bug 7526 - longoverdue.pl leaves items marked as lost as still checked out to patron

When the longoverdu.pl script is run, and it marks an item as lost ( using
LostItem() ), if fails to remove the item from the borrower record. So, the
item is marked as lost, but is also still listed as checked out to the
borrower.

This commit adds the command line parameter --mark-returned. If used,
longoverdue.pl will remove lost items from the borrowers record.
Functionality will remain the same if it is not used.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
http://bugs.koha-community.org/show_bug.cgi?id=7426
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7724: Skip Linker test if Zebra isn't set up
Jared Camins-Esakov [Fri, 16 Mar 2012 11:38:24 +0000 (07:38 -0400)]
Bug 7724: Skip Linker test if Zebra isn't set up

One of the tests in t/db_dependent/Linker_FirstMatch.t ony works if Zebra is
running and authorities have been indexed. This was causing Jenkins agitas.
The test should be skipped if Zebra isn't running or authorities have not been
indexed at the time the test is run.

Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 5549 : fixed non-cloned date object in Add date for calendar, also removed erouno...
Elliott Davis [Mon, 19 Mar 2012 21:56:44 +0000 (16:56 -0500)]
Bug 5549 : fixed non-cloned date object in Add date for calendar, also removed erounous dumper in moremember.pl that dumped entire issue

8 years agoBug 5549 : fixed datetime issue so time is shown in output for circulation.pl and...
Elliott Davis [Mon, 19 Mar 2012 20:24:51 +0000 (15:24 -0500)]
Bug 5549 : fixed datetime issue so time is shown in output for circulation.pl and moremember.pl

8 years agoBug 5549 : Fixing link to calendar
Chris Cormack [Sun, 29 Jan 2012 19:39:02 +0000 (13:39 -0600)]
Bug 5549 : Fixing link to calendar

8 years agoBug 5549 : Fixing the opac-pref
Elliott Davis [Tue, 18 Oct 2011 08:20:14 +0000 (03:20 -0500)]
Bug 5549 : Fixing the opac-pref

8 years agoBug 5549 : fixed clone issue in moremember
Elliott Davis [Wed, 19 Oct 2011 21:02:40 +0000 (21:02 +0000)]
Bug 5549 : fixed clone issue in moremember

8 years agoBug 5549 : fixed save in smart-rules
Elliott Davis [Wed, 19 Oct 2011 20:23:27 +0000 (20:23 +0000)]
Bug 5549 : fixed save in smart-rules

8 years agoBug 5549 : added dropdown for new rule
Elliott Davis [Tue, 18 Oct 2011 09:11:57 +0000 (09:11 +0000)]
Bug 5549 : added dropdown for new rule

8 years agoBug 5549 : fixed typo
Elliott Davis [Tue, 18 Oct 2011 08:59:55 +0000 (08:59 +0000)]
Bug 5549 : fixed typo

8 years agoBug 5549 : added select option in circ rules for unit
Elliott Davis [Tue, 18 Oct 2011 08:56:12 +0000 (08:56 +0000)]
Bug 5549 : added select option in circ rules for unit

8 years agoBug 5549 - Another typo fix
Chris Cormack [Wed, 17 Aug 2011 23:23:08 +0000 (11:23 +1200)]
Bug 5549 - Another typo fix

8 years agoBug 5549 : Fixed bracketing error
Elliott Davis [Wed, 17 Aug 2011 17:02:00 +0000 (12:02 -0500)]
Bug 5549 : Fixed bracketing error

8 years agoBug 5549 - Hourly Loans - Fixing a typo
Chris Cormack [Tue, 16 Aug 2011 22:59:15 +0000 (10:59 +1200)]
Bug 5549 - Hourly Loans - Fixing a typo

8 years agoBug 6430 - DB changes needed to support hourly circ
Chris Cormack [Tue, 31 May 2011 01:35:14 +0000 (13:35 +1200)]
Bug 6430 - DB changes needed to support hourly circ

Changing columns to datetime instead of date

Squashed commit of the following:

commit ccf37880eaf660685d439b000298dcc025e78b6e
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Thu May 26 12:06:24 2011 +1200

    Bug 5549 backing out of decision to change the name of the colums

commit 2e326fdec7d768fe93d41e93abf3ca665a363791
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Tue May 24 14:31:26 2011 +1200

    Bug 5549 : Starting work on hourly loans, changing issues table

8 years agoBug 5549 : CalcFine was corrupting due date
Colin Campbell [Tue, 5 Jul 2011 15:44:16 +0000 (16:44 +0100)]
Bug 5549 : CalcFine was corrupting due date

Clone the passed duedate as the addition of days was
corrupting it in calling context causing new account recs
to be written rather than updating the existing

8 years agoBug 5549 : Refactor fines.pl
Colin Campbell [Thu, 30 Jun 2011 16:04:36 +0000 (17:04 +0100)]
Bug 5549 : Refactor fines.pl

Clean code in fines to remove unnecessary complexity
remove constructs now thought suspect or
not good pracrice

8 years agoBug 5549 : use DateUtils routine for formatting sql date
Colin Campbell [Fri, 24 Jun 2011 13:39:12 +0000 (14:39 +0100)]
Bug 5549 : use DateUtils routine for formatting sql date

Also cleanup modules list to reflect those
actually used

8 years agoBug 5549 : Koha::Calendar::addDate should not loop on -1
Colin Campbell [Fri, 24 Jun 2011 13:28:22 +0000 (14:28 +0100)]
Bug 5549 : Koha::Calendar::addDate should not loop on -1

Control variable of loop should be absolute value
to avoid looping when backtracking

8 years agoBug 5549 : Fix 'specify due date'
Colin Campbell [Fri, 24 Jun 2011 10:05:54 +0000 (11:05 +0100)]
Bug 5549 : Fix 'specify due date'

If due date is set generate a proper DateTime object
for issue procesing

8 years agoBug 5549 : returns calling wrong format routine on date
Colin Campbell [Thu, 23 Jun 2011 14:13:04 +0000 (15:13 +0100)]
Bug 5549 : returns calling wrong format routine on date

We don't have an orm yet

8 years agoBug 5549 : Daily loans should be due at 23:59
Colin Campbell [Thu, 23 Jun 2011 13:11:48 +0000 (14:11 +0100)]
Bug 5549 : Daily loans should be due at 23:59

This was failing in one patch through CalcDueDate

8 years agoBug 5549 : circ/returns needs to import DateUtils
Colin Campbell [Thu, 23 Jun 2011 11:25:55 +0000 (12:25 +0100)]
Bug 5549 : circ/returns needs to import DateUtils

8 years agoBug 5549 Fix a couple of comparisons in C4::Circulation
Colin Campbell [Thu, 23 Jun 2011 11:10:51 +0000 (12:10 +0100)]
Bug 5549 Fix a couple of comparisons in C4::Circulation

Changed a string comparison called on an integer
Deal with case where value is not set without runtime warnings

8 years agoBug 5549 : Format due dates in opac
Colin Campbell [Thu, 23 Jun 2011 10:58:09 +0000 (11:58 +0100)]
Bug 5549 : Format due dates in opac

Further change to ensure that where dates are formatted from the
db form the duedate loses the 23:59

8 years agoBug 5549 : Don't confuse the users with an irrelevant time
Colin Campbell [Thu, 23 Jun 2011 10:35:35 +0000 (11:35 +0100)]
Bug 5549 : Don't confuse the users with an irrelevant time

If the book is due at 23:59 the due time is irrelevant
and potentially confusing to the user add a DateUtils
routine that strips that off the returned display date

8 years agoBug 5549 : move rollingloans.t to db_dependent tests
Colin Campbell [Thu, 23 Jun 2011 10:05:00 +0000 (11:05 +0100)]
Bug 5549 : move rollingloans.t to db_dependent tests

This still needs a followup to make the tests pass with sample data

8 years agoBug 5549 : Calendar needed a change array_ref to hash_ref
Colin Campbell [Thu, 23 Jun 2011 08:39:38 +0000 (09:39 +0100)]
Bug 5549 : Calendar needed a change array_ref to hash_ref

8 years agoBug 5549 : Koha::Calendar needs to accept scalar add_durations
Colin Campbell [Wed, 22 Jun 2011 23:39:26 +0000 (00:39 +0100)]
Bug 5549 : Koha::Calendar needs to accept scalar add_durations

8 years agoBug 5549 : Make Koha::Calendar testable
Colin Campbell [Wed, 22 Jun 2011 23:06:29 +0000 (00:06 +0100)]
Bug 5549 : Make Koha::Calendar testable

Add a testing option
Add a script with tests
Some simplifications of the logic

8 years agoBug 5549 : Fix typo in renewscript
Colin Campbell [Wed, 22 Jun 2011 17:02:36 +0000 (18:02 +0100)]
Bug 5549 : Fix typo in renewscript

8 years agoBug 5549 : Show time due in opac-detail
Colin Campbell [Wed, 22 Jun 2011 16:58:25 +0000 (17:58 +0100)]
Bug 5549 : Show time due in opac-detail

8 years agoBug 5549 : Add Returned, checkout out time to Patron Circ History
Colin Campbell [Wed, 22 Jun 2011 16:48:30 +0000 (17:48 +0100)]
Bug 5549 : Add Returned, checkout out time to Patron Circ History

8 years agoBug 5549 : Fix a couple of date issues from testing
Colin Campbell [Wed, 22 Jun 2011 16:30:34 +0000 (17:30 +0100)]
Bug 5549 : Fix a couple of date issues from testing

8 years agoBug 5549 : Add Extra Perl Dependencies
Colin Campbell [Wed, 22 Jun 2011 09:15:30 +0000 (10:15 +0100)]
Bug 5549 : Add Extra Perl Dependencies

Add:
  DateTime::Timezone
  DateTime::Format::DateParse
  DateTime::Set
  DateTime::Event::ICal
  Readonly
  Readonly::XS

8 years agoBug 5549 : Add script to convert issue_dates
Colin Campbell [Tue, 21 Jun 2011 14:06:51 +0000 (15:06 +0100)]
Bug 5549 : Add script to convert issue_dates

8 years agoBug 5549 : Overdues : Handle some date comparison and display issues
Colin Campbell [Tue, 21 Jun 2011 13:07:41 +0000 (14:07 +0100)]
Bug 5549 : Overdues : Handle some date comparison and display issues

8 years agoBug 5549 : Sip scripts should handle dt due dates
Colin Campbell [Tue, 21 Jun 2011 11:11:05 +0000 (12:11 +0100)]
Bug 5549 : Sip scripts should handle dt due dates

8 years agoBug 5549 : Let Timestamp do the right thing if passed a DateTime
Colin Campbell [Tue, 21 Jun 2011 10:08:20 +0000 (11:08 +0100)]
Bug 5549 : Let Timestamp do the right thing if passed a DateTime

8 years agoBug 5549 : replace curdate with now in a couple of sql lines
Colin Campbell [Mon, 20 Jun 2011 14:48:57 +0000 (15:48 +0100)]
Bug 5549 : replace curdate with now in a couple of sql lines

duedate is now datetime and comparing with curdate
causes a system error

8 years agoBug 5549 : Fix calculation of duedates in fines.pl and advance_notices.pl
Colin Campbell [Mon, 20 Jun 2011 14:47:10 +0000 (15:47 +0100)]
Bug 5549 : Fix calculation of duedates in fines.pl and advance_notices.pl

Cleaned up some no longer used parameters in
Overdues::CalcFine

8 years agoBug 5549 : Add days_between method to Koha::Calendar
Colin Campbell [Mon, 20 Jun 2011 11:08:14 +0000 (12:08 +0100)]
Bug 5549 : Add days_between method to Koha::Calendar

8 years agoBug 5549 : Format Date in ILSDI::Services to include hhmm
Colin Campbell [Mon, 20 Jun 2011 09:22:04 +0000 (10:22 +0100)]
Bug 5549 : Format Date in ILSDI::Services to include hhmm