wip/koha-equinox.git
8 years agobug 7818: teach rebuild_zebra.pl which filter is in effect dom-biblio
Galen Charlton [Fri, 6 Apr 2012 14:10:37 +0000 (10:10 -0400)]
bug 7818: teach rebuild_zebra.pl which filter is in effect

Because of the way that the GRS-1 SGML filter works, if you're
indexing multiple documents, you can't just wrap them in a document
element, but the DOM filter *requires* it.  Consequently, two
new config settings in koha-conf.xml are added to indicate the
Zebra filter in use so that the -x option of rebuild_zebra.pl
knows whether to wrap the exported records or not:

- bib_index_mode (defaults to 'grs1' if not specified)
- auth_index_mode (defaults to 'dom')

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
8 years agobug 7818: using -x when indexing authorities is now supported
Galen Charlton [Fri, 6 Apr 2012 13:57:01 +0000 (09:57 -0400)]
bug 7818: using -x when indexing authorities is now supported

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
8 years agobug 7818: use Title-cover for title phrase weighting
Galen Charlton [Fri, 6 Apr 2012 04:48:04 +0000 (00:48 -0400)]
bug 7818: use Title-cover for title phrase weighting

This is offerred as a compromise alternative to creating
a new Title-rel index to avoid having the statement of
responsiblity unduly affect field weight when using the DOM
filter and MARC21 -- the problem with creating a Title-rel index
is that it would *force* reindexing upon upgrade.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
8 years agobug 7818: -x option of rebuild_zebra.pl now works with DOM filter
Galen Charlton [Fri, 6 Apr 2012 04:05:46 +0000 (00:05 -0400)]
bug 7818: -x option of rebuild_zebra.pl now works with DOM filter

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
8 years agobug 7818: fix up koha-conf.xml template
Galen Charlton [Wed, 28 Mar 2012 16:45:44 +0000 (12:45 -0400)]
bug 7818: fix up koha-conf.xml template

Missed section to include the retrieval XSLT for DOM.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
8 years agobug 7818: Zebra DOM filter index definitions for MARC21 bibs
Galen Charlton [Mon, 26 Mar 2012 05:16:11 +0000 (01:16 -0400)]
bug 7818: Zebra DOM filter index definitions for MARC21 bibs

The file biblio-zebra-indexdefs.xsl, which is the stylesheet that
is used by the Zebra DOM filter to convert an incoming MARC21 bib
to its indexed form, was generated by the following two steps:

misc/maintenance/make_zebra_dom_cfg_from_record_abs \
  --input  etc/zebradb/marc_defs/marc21/biblios/record.abs \
  --output etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml

xsltproc etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl \
  etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml \
  > etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl

Records indexed using this XSLTshould behave similarly to records
indexed using the GRS-1 filter and the old record.abs definition, with
the following big exception (and improvemwent): indexed phrases now
span subfield boundaries if a specific subfield wasn't specified in the
index definition.  For example, the GRS-1 filter index definition

melm 245 Title

would allow 245 $a Cats on boxes : $b cardboard fantasies

to be searched as the phrases "cats on boxes" or "cardboard fantasies",
but a title phrase seach of "cats on boxes cardboard fantasises"
wouldn't work.  The DOM filter equivalent,

<index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="245">
  <target_index>Title:w</target_index>
  <target_index>Title:p</target_index>
</index_data_field>

*does* allow phrase searches to span subfield boundaries.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
8 years agobug 7818: add index_data_field option to DOM indexing repertoire
Galen Charlton [Mon, 26 Mar 2012 05:10:09 +0000 (01:10 -0400)]
bug 7818: add index_data_field option to DOM indexing repertoire

Adds a new kohaidx:index_data_field index definition type which
indexes all of the subfields of a MARC data field as a single
phrase, separating the contents of each with a space.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
8 years agobug 7818: move koha-indexdefs-to-zebra.xsl
Galen Charlton [Mon, 26 Mar 2012 05:08:58 +0000 (01:08 -0400)]
bug 7818: move koha-indexdefs-to-zebra.xsl

Since this stylesheet will be used by both bib and authority
indexing, put in a central location.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
8 years agobug 7818: utility to generate DOM indexing configs
Galen Charlton [Mon, 26 Mar 2012 05:05:58 +0000 (01:05 -0400)]
bug 7818: utility to generate DOM indexing configs

misc/maintenance/make_zebra_dom_cfg_from_record_abs:
  generate a DOM filter Zebra index config from a GRS-1 config

Given a Zebra record.abs file containing a set of index definitions for
Zebra's GRS-1 filter, write an equivalent DOM filter configuration.

To generate the XSLT that is to be used by Zebra, run something like
the following on the output of this utility:

xsltproc ZEBRA_CFG_DIR/xsl/koha-indexdefs-to-zebra.xsl \
  biblio-koha-indexdefs.xml \
  > ZEBRA_CFG_DIR/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl

The above example assumes that the output of the program was named
biblio-koha-indexdefs.xsl.

This commit also introduces Koha::Indexer::Utils, a new package for
misceallenous routines that support Koha's indexing definitions.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
8 years agobug 7818: update miscellaneous installer scripts
Galen Charlton [Fri, 23 Mar 2012 23:08:58 +0000 (19:08 -0400)]
bug 7818: update miscellaneous installer scripts

Teach a couple of the quick-install scripts about
DOM mode for bibs.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
8 years agobug 7818: update installer for biblio DOM indexing
Galen Charlton [Fri, 23 Mar 2012 22:52:27 +0000 (18:52 -0400)]
bug 7818: update installer for biblio DOM indexing

Adds the necessary bits to enable DOM indexing for bib
records as an option during installation from source.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
8 years agoBug 6679 : Fixing perlcritic violation
Chris Cormack [Thu, 22 Mar 2012 20:03:43 +0000 (09:03 +1300)]
Bug 6679 : Fixing perlcritic violation

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoMerge remote-tracking branch 'origin/new/bug_7548'
Paul Poulain [Fri, 23 Mar 2012 09:24:19 +0000 (10:24 +0100)]
Merge remote-tracking branch 'origin/new/bug_7548'

8 years agoBug 7548 Fix variable scoping in the template - Rebased
koha [Wed, 29 Feb 2012 22:05:21 +0000 (17:05 -0500)]
Bug 7548 Fix variable scoping in the template - Rebased

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agobug 6140 follow-up: DBRev number
Paul Poulain [Thu, 22 Mar 2012 17:27:02 +0000 (18:27 +0100)]
bug 6140 follow-up: DBRev number

8 years agoBug 6140 - Set a timeout to z3950 servers that could have network problems occasionally
Juan Romay Sieira [Wed, 21 Mar 2012 13:56:54 +0000 (14:56 +0100)]
Bug 6140 - Set a timeout to z3950 servers that could have network problems occasionally

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
8 years agoBug 7779 - tools/letter.pl: scope vars for plack
Dobrica Pavlinusic [Wed, 21 Mar 2012 13:26:02 +0000 (14:26 +0100)]
Bug 7779 - tools/letter.pl: scope vars for plack

Signed-off-by: Alex Arnaud <alex@stephane-E5420>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7760 - Add ids and classes to every staff page to help with customization (report...
Katrin Fischer [Thu, 22 Mar 2012 11:09:59 +0000 (12:09 +0100)]
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>
8 years agoBug 7760 - Add ids and classes to every staff page to help with customization (patron...
Katrin Fischer [Thu, 22 Mar 2012 10:53:48 +0000 (11:53 +0100)]
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>
8 years agoBug 7760 - Add ids and classes to every staff page to help with customization (tools)
Katrin Fischer [Thu, 22 Mar 2012 10:40:09 +0000 (11:40 +0100)]
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>
8 years agoAdd ids and classes to every staff page to help with customization (serials)
Katrin Fischer [Thu, 22 Mar 2012 10:19:45 +0000 (11:19 +0100)]
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>
8 years agoBug 7760 - Add ids and classes to every staff page to help with customization (patrons)
Katrin Fischer [Thu, 22 Mar 2012 10:12:12 +0000 (11:12 +0100)]
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>
8 years agoBug 7760 - Add ids and classes to every staff page to help with customizaton (lists...
Katrin Fischer [Thu, 22 Mar 2012 10:00:54 +0000 (11:00 +0100)]
Bug 7760 - Add ids and classes to every staff page to help with customizaton (lists, suggestion, z39.50)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
8 years agoBug 7760 - Add ids and classes to every staff page to help with customizaton (circula...
Katrin Fischer [Wed, 21 Mar 2012 21:45:09 +0000 (22:45 +0100)]
Bug 7760 - Add ids and classes to every staff page to help with customizaton (circulation)

New id: circ_<filename>
New class: circ

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
8 years agoBug 7760 - Add ids and classes to every staff page to help with customizaton (catalog...
Katrin Fischer [Wed, 21 Mar 2012 21:07:33 +0000 (22:07 +0100)]
Bug 7760 - Add ids and classes to every staff page to help with customizaton (cataloguing)

New ids: cat_<filename>
New class: cat

Exceptions:
moveitem and linkitem are accessible from the catalog pages, so have
been made 'catalog' for styling.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
8 years agoBug 7760 - Add ids and classes to every staff page to help with customizaton (catalog)
Katrin Fischer [Wed, 21 Mar 2012 15:54:47 +0000 (16:54 +0100)]
Bug 7760 - Add ids and classes to every staff page to help with customizaton (catalog)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
8 years agoBug 7760: Add ids and classes to every staff page to help with customizaton (batch...
Katrin Fischer [Wed, 21 Mar 2012 15:25:10 +0000 (16:25 +0100)]
Bug 7760: Add ids and classes to every staff page to help with customizaton (batch, error)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
8 years agoBug 7760: Add ids and classes to every staff page to help with customizaton (cart)
Katrin Fischer [Wed, 21 Mar 2012 15:19:00 +0000 (16:19 +0100)]
Bug 7760: Add ids and classes to every staff page to help with customizaton (cart)

id = cart_<filename>
class = cart

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
8 years agoBug 7760: Add unique ids and a module class to all administration pages
Katrin Fischer [Tue, 20 Mar 2012 17:00:32 +0000 (18:00 +0100)]
Bug 7760: Add unique ids and a module class to all administration pages

This is the first patch for bug 7760 and touches all pages in administration.
This adds a unique id "admin_<filename>" and a class "admin" to the body tag of
each page in administration.

Note: aqcontract can only be accessed from the acquisition module, so I made it acq
instead of admin.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
8 years agoBug 7760: Add unique ids and a module class to all authorities pages
Katrin Fischer [Tue, 20 Mar 2012 16:02:41 +0000 (17:02 +0100)]
Bug 7760: Add unique ids and a module class to all authorities pages

This is the first patch for bug 7760 and touches all pages in authorities.
This adds a unique id "auth_<filename>" and a class "auth" to the body tag of
each page in the authorities module.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
8 years agoBug 7760: Add unique ids and a module class to all acquisitions pages
Katrin Fischer [Tue, 20 Mar 2012 15:41:17 +0000 (16:41 +0100)]
Bug 7760: Add unique ids and a module class to all acquisitions pages

This is the first patch for bug 7760 and touches all pages in acquisitions.
This adds a unique id "acq_<filename>" and a class "acq" to the body tag of
each page in acquisitions.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
8 years agoSIGNED-OFF Bug 7590 Cataloging authorities search result page is broken
Frédéric Demians [Fri, 24 Feb 2012 07:50:16 +0000 (08:50 +0100)]
SIGNED-OFF Bug 7590 Cataloging authorities search result page is broken

This bug occurs on UNIMARC DB with authorities linked together with TS/TG
relations. To reproduce it:

- Add a new biblio record
- On 610 field, click on the tag editor button to search an authority
- In the Authority search window, enter a large search
- On the result page, for authorities having relations with other terms, in the
  Get it! column, you get a mess of TS/TG relations and not more Choose link.

Signed-off-by: François Charbonnier <francois.charbonnier@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7765 - labels/label-edit-layout.pl: plack $layout scoping
Dobrica Pavlinusic [Tue, 20 Mar 2012 13:24:44 +0000 (14:24 +0100)]
Bug 7765 - labels/label-edit-layout.pl: plack $layout scoping

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7767 - acqui/basketgroup.pl: our $template scoping for plack
Dobrica Pavlinusic [Tue, 20 Mar 2012 13:50:05 +0000 (14:50 +0100)]
Bug 7767 - acqui/basketgroup.pl: our $template scoping for plack

Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoMerge remote-tracking branch 'origin/new/bug_7768'
Paul Poulain [Thu, 22 Mar 2012 16:51:14 +0000 (17:51 +0100)]
Merge remote-tracking branch 'origin/new/bug_7768'

8 years agoBug 7768 - acqui/z3950_search.pl: remove sub displayresults to fix plack scoping
Dobrica Pavlinusic [Wed, 21 Mar 2012 09:43:31 +0000 (10:43 +0100)]
Bug 7768 - acqui/z3950_search.pl: remove sub displayresults to fix plack scoping

Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agobug 5549: follow-up DBRev number
Paul Poulain [Thu, 22 Mar 2012 16:47:52 +0000 (17:47 +0100)]
bug 5549: follow-up DBRev number

8 years agoMerge remote-tracking branch 'catalyst/merged_5549' into new/bug_5549
Paul Poulain [Thu, 22 Mar 2012 16:34:26 +0000 (17:34 +0100)]
Merge remote-tracking branch 'catalyst/merged_5549' into new/bug_5549

Conflicts:
installer/data/mysql/updatedatabase.pl
members/moremember.pl

8 years agoBug 7737: applies date filters on vendor pages
Adrien Saurat [Thu, 22 Mar 2012 09:20:14 +0000 (10:20 +0100)]
Bug 7737: applies date filters on vendor pages

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7310 follow-up : typo fix lt instead of < in DB version comparison
Paul Poulain [Thu, 22 Mar 2012 15:55:56 +0000 (16:55 +0100)]
Bug 7310 follow-up : typo fix lt instead of < in DB version comparison

8 years agoBug 7769 - members/pay.pl: $template scoping for plack
Dobrica Pavlinusic [Wed, 21 Mar 2012 10:01:39 +0000 (11:01 +0100)]
Bug 7769 - members/pay.pl: $template scoping for plack

Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 5841: Routing slip not displaying publication date
Katrin Fischer [Tue, 21 Feb 2012 06:19:54 +0000 (07:19 +0100)]
Bug 5841: Routing slip not displaying publication date

To test:
Compare output of the 2 different links for  printing routing lists.

1) Links in the table of issues on the serial collection page
2) Link following the steps from editing and saving a routing list

Both previews should show the date now.

Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 6125: repairs dateaccessioned plugin
Adrien Saurat [Tue, 20 Mar 2012 12:56:56 +0000 (13:56 +0100)]
Bug 6125: repairs dateaccessioned plugin

1/ It now works with neworderempty.pl
2/ The set_to_today function was moved from
additem.tt to dateaccessioned.pl (so it's
available to all pages using the plugin)

Signed-off-by: Julien Sicot <julien.sicot@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7154 follow-up DBRev
Paul Poulain [Thu, 22 Mar 2012 15:02:10 +0000 (16:02 +0100)]
Bug 7154 follow-up DBRev

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7154: Modification in borrower attributes
Jonathan Druart [Fri, 10 Feb 2012 08:57:35 +0000 (09:57 +0100)]
Bug 7154: Modification in borrower attributes

* group some attributes for a more friendly display

* allow a link between a borrower category and an attribute to display
  it only for the specified category

* Attr classes filled with AV 'PA_CLASS' category (you have to create AV
  with a new category 'PA_CLASS' to fill class list)

this patch add 2 fields in borrower_attribute_types :
    category_code
    class

Signed-off-by: Julien Sicot <julien.sicot@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agobug 7264: follow-up DBRev number
Paul Poulain [Thu, 22 Mar 2012 10:59:46 +0000 (11:59 +0100)]
bug 7264: follow-up DBRev number

8 years agobug_7264: [SIGNED-OFF] Branch popup on OPAC detail.Added opac_info field to branches...
Srdjan Jankovic [Fri, 9 Mar 2012 01:12:26 +0000 (14:12 +1300)]
bug_7264: [SIGNED-OFF] Branch popup on OPAC detail.Added opac_info field to branches table.

Signed-off-by: Delaye stephane <stephane.delaye@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7714 translating letters in fr-FR to french
Paul Poulain [Wed, 14 Mar 2012 14:11:36 +0000 (15:11 +0100)]
Bug 7714 translating letters in fr-FR to french

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Does the job. This notifications are MySQL loadable. I've translated .txt file.

8 years agoBug 5482 [Follow up] Translation problem in guided reports - Item field names
Owen Leonard [Wed, 21 Mar 2012 14:01:49 +0000 (15:01 +0100)]
Bug 5482 [Follow up] Translation problem in guided reports - Item field names

Making some additional corrections.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 5482: Update colums.def file
Katrin Fischer [Tue, 20 Mar 2012 14:39:46 +0000 (15:39 +0100)]
Bug 5482: Update colums.def file

Updates the borrowers and items table descriptions using the
descriptions from the interface and the MARC21 default framework.
Biblio and biblioitems still need some work.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
8 years agoBug 5482 - Translation problem in guided reports - Item field names
Owen Leonard [Tue, 20 Mar 2012 11:10:52 +0000 (12:10 +0100)]
Bug 5482 - Translation problem in guided reports - Item field names

This very minor correction adds display of the column name even
if the field description exists in the columns .def file.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Changes the display to show description / table.column.

8 years agoBug 5180: FIX autocomplete on overdues report
Jonathan Druart [Wed, 14 Mar 2012 13:34:27 +0000 (14:34 +0100)]
Bug 5180: FIX autocomplete on overdues report

- Switch off the CircAutocompl syspref
- Set a (one or more) patron attr type searchable
- go on the overdues page
Firebug crash and a layout problem appears on the left.

Firebug error is "YAHOO.widget.DS_XHR is not a constructor"

retry with this patch.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7732: Restoring "More lists" in the Add-to combo of OPAC Search Results
Marcel de Rooy [Mon, 19 Mar 2012 13:11:35 +0000 (14:11 +0100)]
Bug 7732: Restoring "More lists" in the Add-to combo of OPAC Search Results

1) More lists -> More Lists in order to be consistent with context.
2) More Lists is put just before New List at the end of the combo list. (More logical place than between your and public lists.)
3) More Lists is only shown when the number of private or public lists exceeds 9; this is a pragmatic and hard-coded approach for now. Only if there are exactly 10 lists, this does not really add a list. But who cares about that?
4) Resolves a potential bug with an [% END %] at the wrong place. Moved it after the finishing optgroup tag.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Performed a search in the OPAC without the patch and More Lists does
not appear. Applied patch and perfomred OPAC search again and the More
Lists option reappears. Signed off.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7738: "Display more constraints' in subfield configuraiton is not properly transl...
Katrin Fischer [Mon, 19 Mar 2012 15:05:55 +0000 (16:05 +0100)]
Bug 7738: "Display more constraints' in subfield configuraiton is not properly translatable

The Javascript toggling the link description was checking for the english
link text. This would not work for translated templates.

Tested: Apply patch, then translate update and translate install.
Text changes as appropriate (with manually inserted translation in .po file)

Signed-off-by: mveron <veron@veron.ch>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7746: "No Public Lists." not translatable.
Katrin Fischer [Mon, 19 Mar 2012 16:06:23 +0000 (17:06 +0100)]
Bug 7746: "No Public Lists." not translatable.

I applied the patch and did a translate update / translate install.
No public lists is now surrounded by P-tags as expected.

Signed-off-by: mveron <veron@veron.ch>
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
QA Comment:  fixed small typo ('pists' instead of 'lists')

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7778: fixes creation of a new server
Adrien Saurat [Wed, 21 Mar 2012 14:29:50 +0000 (15:29 +0100)]
Bug 7778: fixes creation of a new server

It is now possible to add a new server
The page also now complies with the bug 2505 request
(use warnings has been added, and variables declarations
corrected to prevent warnings)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works perfectly, tested adding, editing and deleting z39.50 servers.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7771: "Notices" changed to "Notices & Slips"
Adrien Saurat [Wed, 21 Mar 2012 10:15:18 +0000 (11:15 +0100)]
Bug 7771: "Notices" changed to "Notices & Slips"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7745: Wrong service name for CAS authentification
Julian Maurice [Tue, 19 Jul 2011 10:14:00 +0000 (12:14 +0200)]
Bug 7745: Wrong service name for CAS authentification

When behind a proxy, Koha give a wrong service name to CAS server
(SCRIPT_URI environment variable). It now uses OPACBaseURL syspref.

Note: despite the OPACBaseURL description, you have to enter the
*full* URL (ie: with http:// or https://) in the syspref. (see Bug
7770)
Signed-off-by: Pierre Angot <tredok.pierre@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7753: serials-home displays library name instead of code
Adrien Saurat [Tue, 20 Mar 2012 13:42:21 +0000 (14:42 +0100)]
Bug 7753: serials-home displays library name instead of code

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7300 : Show working branch suggestions by default
Matthias Meusburger [Fri, 2 Mar 2012 13:33:39 +0000 (14:33 +0100)]
Bug 7300 : Show working branch suggestions by default

By default, let the librarian see only suggestions made by patrons of his library.
The patron can choose to see other's as well, it's just the default.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7700: Cart's more details view shows identity numbers
Katrin Fischer [Sun, 11 Mar 2012 17:47:18 +0000 (18:47 +0100)]
Bug 7700: Cart's more details view shows identity numbers

We already remove $9 with Koha's authority number from output
of GetMarcSubjects and GetMarcAuthors.
Patch additionally removes $0 subfields with identity numbers.

Patch also effects detail pages with normal (non-XSLT) views.

Revised to always remove $0 subfields, they are not used in UNIMARC.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoMerge remote-tracking branch 'kc/master' into merged_5549
Chris Cormack [Thu, 22 Mar 2012 04:05:16 +0000 (17:05 +1300)]
Merge remote-tracking branch 'kc/master' into merged_5549

8 years agobug 7310 follow-up DBVersion was wrong
Paul Poulain [Thu, 22 Mar 2012 04:00:11 +0000 (05:00 +0100)]
bug 7310 follow-up DBVersion was wrong

Thanks Ian for pointing that the DBVersion defined for 7310 was wrong : I missed it had a 99 that should have been a 00

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