[koha-commits] main Koha release repository branch 3.6.x updated. v3.06.01-19-g8781f9b
Git repo owner
gitmaster at git.koha-community.org
Sat Dec 3 04:17:58 CET 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, 3.6.x has been updated
via 8781f9be8551aec8e2fbe1ca14dea3009736d914 (commit)
via a713fbb7eaff1714ea49dcb0e8f86f76010f90df (commit)
via 86f9e19babe1dd2562a65f7e07107c6bf93a66e8 (commit)
via 9143fb4270672d0b456e6651456b6075e6552d3c (commit)
via 58b52329e326098e56b3b9855cd6890c9f27e154 (commit)
via 4e3668464b1e0cb4fa00d5543ef071c16af0f011 (commit)
via 3d25783fd9d8214bb2de44d66a36b0aac5319893 (commit)
via f940e3ce1c302e5e1b46401cd3c1d5d7b1453997 (commit)
via 6b088fa833799c67280a6f47bcf5f980b99a78ae (commit)
via 1dffe0750b93e60e7d35ca1c28ee25eef5b37ed3 (commit)
via 6b185b5e55770ddfc1287d188daa543921d6dac1 (commit)
via 98d7ae719d2c275560326a388661472e5190077f (commit)
via e83cda0360a66c4c8af247132dd6f9da6d775489 (commit)
via db92d1cdc8b9bb50021c12d0966790fd0acedc0a (commit)
via 05ba6867ccffc3b8673f6a69a2370d979a60d324 (commit)
via 989656fe82c43d415780dad40a2d7361a1f3971b (commit)
via 809fe0827989b269fdbe011c2197e379f08a8452 (commit)
from 34df64b03f4c2eabc8303676d59d8b2dcea67db6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8781f9be8551aec8e2fbe1ca14dea3009736d914
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date: Thu Nov 17 12:45:47 2011 +1300
Bug 6303: Display Organisation and Parent Organisation names when viewing a borrower of type organisation
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as advertised, doesn't affect display for non-organisational patrons.
Note: Display change in OPAC only affects the summary tab.
It would be a little bit more consistent to make the name show the
same on all tabs in OPAC patron account.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
I repeated Katrin's signoff here (with permission). The patch only changed for some minor rebasing and cosmetic QA requests. Passed QA now.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 2b2e544f054acc5c220dfca035554e2d13b27cdf)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a713fbb7eaff1714ea49dcb0e8f86f76010f90df
Author: Magnus Enger <magnus at enger.priv.no>
Date: Mon Oct 17 12:23:09 2011 +0200
Bug 4877 - Add DocBook for missing manual pages
Add DocBook manual pages for commands that do not have a manual page yet. Also
add a page for koha-common itself, listing all the available commands.
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
Minor change: I fixed a typo I spotted
(cherry picked from commit fab2d8b0abdb2a1af711d8b2ee6f287eef35d91d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 86f9e19babe1dd2562a65f7e07107c6bf93a66e8
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Thu Oct 20 15:54:07 2011 -0400
Bug 7073: GetCOinSBiblio should take $record object, not biblionumber
This patch changes the GetCOinsBiblio subroutine to take a MARC record object
(as returned from GetMarcBiblio) instead of a biblionumber. The first thing the subroutine
did was GetMarcBiblio, and the $biblionumber passed was never used again.
This subroutine was only used 3 places: opac/opac-search.pl, opac/opac-detail.pl,
and C4/VirtualShelves/Page.pm. In the first and last cases, it was used in a loop.
In the last two cases, a call to GetMarcBiblio had already been done. This is expensive, and
we were doing it twice per record.
For opac/opac-search.pl, the call to GetMarcBiblio was moved to just outside GetCOinSBiblio;
this will not change the performance at all. But for opac/opac-detail.pl and C4/VirtualShelves/Page.pm,
a redudant call to GetMarcBiblio is now avoided.
To Test:
1. Enable COinSinOPACResults in system preferences. Perform a search in the OPAC.
Verify that the COinS spans are showing up
2. View the detail record of one of the returned items. Confirm that the COinS span exists on the detail page.
3. View a list in the OPAC. Confirm that COinS spans are still showing up
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit f56e6c0a58145ed3a30341bf0df85e17cde0135d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 9143fb4270672d0b456e6651456b6075e6552d3c
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Fri Jul 15 15:04:31 2011 +1200
Bug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4 series
This brings all the changelog entries for releases up to what has been
included in the packages
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 0fd451060eb2cd88d3f44e68dfa8da6e9ae2956d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 58b52329e326098e56b3b9855cd6890c9f27e154
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Wed Oct 26 15:03:36 2011 +1300
Bug 7091 - [MASTER] - update the build version for packages from master
This updates the default version number that packages are build with to
be 3.7. This should be applied to master only.
Signed-off-by: Mason James <mtj at kohaaloha.com>
(cherry picked from commit 03dffd8374ee3df9836346b56d56d9bdd2e32e31)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 4e3668464b1e0cb4fa00d5543ef071c16af0f011
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Mon Nov 28 12:13:42 2011 +0100
fixing the translatable-template.t to handle localized setups
Depending on your locale, msgmerge will return a different messages, enclosed in .... and .
The flow is not utf8 compliant, so this patch switches to testing "..... anything." instead of ".... word."
Now the test work on my (french setup)
(cherry picked from commit c95cbce4ce8df9d9d8f664b84a3d15a6e8e8cc57)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3d25783fd9d8214bb2de44d66a36b0aac5319893
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Wed Nov 30 17:12:06 2011 +0100
Revert "Fix for Bug 6291, Cart printing truncated in Firefox"
see
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6291, comment 7, 9 and http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7279
This reverts commit da0a5b2bd63027102dd61789fc455941e237abc9.
(cherry picked from commit c7ef4da571cc5451e4922a0ad0f5a2d285d91f77)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f940e3ce1c302e5e1b46401cd3c1d5d7b1453997
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Nov 8 12:46:39 2011 +0000
Bug 7191 Remove GetBorrowerIssues from @EXPORT
No subroutine GetBorrowerIssues exists in C4::Circulation
So don't export it into users' namespace
Signed-off-by: Albert Oller <ago at bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 862b6ee90dfad9d00fc29bc4dc2d3cf8e0159815)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 6b088fa833799c67280a6f47bcf5f980b99a78ae
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon Nov 7 15:30:20 2011 +1300
Bug 7268: Fixing failing tests for translatable templates
To test run
perl xt/author/translatable-templates.t
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Test runs without any complaints about the fixed templates now.
Also checked detail pages without XSLT turned on display correctly.
(cherry picked from commit 66fa8288461c8f14108a507de91977b3394d1c0c)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 1dffe0750b93e60e7d35ca1c28ee25eef5b37ed3
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Tue Oct 25 17:38:04 2011 +0200
Bug 6894: Order from suggestion defaulting to wrong currency
This problem turned out to be a bit different, than I initally thought.
This patch fixes the currency selections for new orders created in staff.
Before this patch, the first currency in the list was selected instead
of the active currency. So you needed to change it explicitly.
After patch it should work like this:
1) Suggestion created in OPAC - currency defaults to NULL in database
2) Editing a suggestion created in OPAC will default to active currency.
3) Creating a new suggestion in staff will default to active currency.
4) When ordering, the currency will default to the vendor currency, if no
currency is set in the suggestion. (still happens, when suggestions are accepted
in batch from the list.
I hope this is right - comments and testing appreciated.
Signed-off-by: Liz Rea <lrea at nekls.org>
Verified that in the above places, active currency was displayed or selected. Tested both suggestions entered from the OPAC and from the intranet.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Verified the existence of the bug, and that the fix works as advertised.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 624b1562d8567dabd23cb4e1ac7e34615e604edc)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 6b185b5e55770ddfc1287d188daa543921d6dac1
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Fri Oct 28 17:33:31 2011 +0200
Bug 3388: Restore account number on vendor page
This patch makes it possible to add the account number to the
vendor information. The used field aqbookseller.accountnumber was
already existent in the database.
To test:
1) Add a new vendor with accountnumber
> Verify form has a field for accountnumber
> Verify accountnumber does show up on vendor summary page
2) Edit this vendor, change accountnumber
> Verify change was correctly saved and new number is displayed on
vendor summary page
3) Delete accountnumber
Signed-off-by: Liz Rea <lrea at nekls.org>
Tested 1-3, no troubles found.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 573b9275a6ab3fa1c0b24ce202ab69c44238b963)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 98d7ae719d2c275560326a388661472e5190077f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Nov 23 13:33:26 2011 +0100
Bug 7254 Show pending orders from baskets with closedate > 180 days
Current code for selecting pending orders does not select orders from baskets
with a closedate > 180 days.
The code in Acquisition.pm already includes a FIXME for that.
IMHO this part of the where clause should just be removed; an order is pending
until it is filled. If you do not want to fill it, delete it.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit fd949453e86b2def06b471a3b3bfa293bce78a75)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit e83cda0360a66c4c8af247132dd6f9da6d775489
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Fri Nov 18 12:12:29 2011 +1300
Bug 7242 : Fixing typo in a div
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit fda4af9a3ee582a483695ba0cab4061101e2d56d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit db92d1cdc8b9bb50021c12d0966790fd0acedc0a
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Nov 21 07:54:15 2011 +0100
Bug 7250: stage_biblios_file.pl is missing options for encoding
- adds command line options for encoding, defaulting to utf8
- options match options availablen in the stage marc records form
of the staff interface
- activates warnings
- adds copyright statement
To test:
Import records with diacritics using the stage_biblios_file.pl
Records can be imported into the catalog using the staff interface
or the commit_biblios_file.pl script.
Signed-off-by: Ulrich Kleiber <ulrich.kleiber at bsz-bw.de>
Successfully tested with default encoding utf8.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 1b49f54b8828c7ee4ecba8856886f9662d9712d8)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 05ba6867ccffc3b8673f6a69a2370d979a60d324
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Sat Sep 17 12:45:09 2011 +0100
Bug 6877 - use is executed and errors at compile time
Although use is being called in an eval it will still be executed
at compile time so that an error can cause the script to abort before
the eval is executed. The eval expression syntax is not checked
so eval block should be preferred.
Use require/import which execute at runtime which is the intention
here.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
checked that, with Libravatar OK things are still OK
(cherry picked from commit 4f49dc5ad05289820916c6fd879e70f3adeee253)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 989656fe82c43d415780dad40a2d7361a1f3971b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon Nov 21 20:30:19 2011 +1300
Bug 4330: Missing License Statement
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
(cherry picked from commit 40bd14e0ea98152377a0a416482fe0227fee17bd)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 809fe0827989b269fdbe011c2197e379f08a8452
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon Nov 21 20:26:01 2011 +1300
Bug 4330: Wrong address for Free Software Foundation
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
(cherry picked from commit 93d4c90a681d527044567bbbb7d5f81aec31a6b5)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 5 +-
C4/Biblio.pm | 9 +-
C4/Bookseller.pm | 15 +-
C4/Circulation.pm | 1 -
C4/Members.pm | 22 ++-
C4/VirtualShelves/Page.pm | 2 +-
about.pl | 6 +-
acqui/supplier.pl | 2 +
acqui/updatesupplier.pl | 1 +
circ/circulation.pl | 7 +-
debian/build-git-snapshot | 2 +-
debian/changelog | 25 +++
debian/docs/koha-common.xml | 206 ++++++++++++++++++++
debian/docs/koha-create-dirs.xml | 43 ++++
debian/docs/koha-disable.xml | 45 +++++
debian/docs/koha-dump-defaults.xml | 44 ++++
debian/docs/koha-dump.xml | 45 +++++
debian/docs/koha-email-disable.xml | 42 ++++
debian/docs/koha-email-enable.xml | 42 ++++
debian/docs/koha-enable.xml | 45 +++++
debian/docs/koha-foreach.xml | 43 ++++
debian/docs/koha-list.xml | 73 +++++++
debian/docs/koha-mysql.xml | 44 ++++
debian/docs/koha-rebuild-zebra.xml | 67 +++++++
debian/docs/koha-remove.xml | 17 ++-
debian/docs/koha-reset-passwd.xml | 44 ++++
debian/docs/koha-restart-zebra.xml | 44 ++++
debian/docs/koha-restore.xml | 45 +++++
debian/docs/koha-start-zebra.xml | 44 ++++
debian/docs/koha-stop-zebra.xml | 44 ++++
debian/docs/koha-upgrade-schema.xml | 44 ++++
debian/docs/koha-upgrade-to-3.4.xml | 41 ++++
koha-tmpl/intranet-tmpl/prog/en/css/print.css | 9 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +-
.../prog/en/includes/patron-title.inc | 6 +
.../prog/en/modules/acqui/supplier.tt | 11 +-
.../prog/en/modules/catalogue/detail.tt | 4 +-
.../prog/en/modules/circ/circulation.tt | 21 +-
.../prog/en/modules/members/boraccount.tt | 4 +-
.../prog/en/modules/members/member.tt | 4 +-
.../prog/en/modules/members/moremember.tt | 10 +-
.../prog/en/modules/members/notices.tt | 6 +-
.../prog/en/modules/members/readingrec.tt | 4 +-
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 17 ++-
koha-tmpl/opac-tmpl/prog/en/css/print.css | 9 +-
.../opac-tmpl/prog/en/includes/patron-title.inc | 5 +
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 2 +-
.../opac-tmpl/prog/en/modules/opac-shelves.tt | 2 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 7 +-
.../opac-tmpl/prog/en/modules/opac-userupdate.tt | 7 +-
mainpage.pl | 7 +-
members/boraccount.pl | 3 +-
members/moremember.pl | 6 +-
members/readingrec.pl | 1 +
misc/stage_biblios_file.pl | 35 +++-
opac/opac-detail.pl | 13 +-
opac/opac-export.pl | 7 +-
opac/opac-search.pl | 3 +-
opac/opac-showreviews.pl | 11 +-
opac/opac-user.pl | 2 +
opac/sco/sco-main.pl | 16 ++
suggestion/suggestion.pl | 10 +-
tools/viewlog.pl | 3 +
xt/author/translatable-templates.t | 7 +-
64 files changed, 1297 insertions(+), 116 deletions(-)
create mode 100644 debian/docs/koha-common.xml
create mode 100644 debian/docs/koha-create-dirs.xml
create mode 100644 debian/docs/koha-disable.xml
create mode 100644 debian/docs/koha-dump-defaults.xml
create mode 100644 debian/docs/koha-dump.xml
create mode 100644 debian/docs/koha-email-disable.xml
create mode 100644 debian/docs/koha-email-enable.xml
create mode 100644 debian/docs/koha-enable.xml
create mode 100644 debian/docs/koha-foreach.xml
create mode 100644 debian/docs/koha-list.xml
create mode 100644 debian/docs/koha-mysql.xml
create mode 100644 debian/docs/koha-rebuild-zebra.xml
create mode 100644 debian/docs/koha-reset-passwd.xml
create mode 100644 debian/docs/koha-restart-zebra.xml
create mode 100644 debian/docs/koha-restore.xml
create mode 100644 debian/docs/koha-start-zebra.xml
create mode 100644 debian/docs/koha-stop-zebra.xml
create mode 100644 debian/docs/koha-upgrade-schema.xml
create mode 100644 debian/docs/koha-upgrade-to-3.4.xml
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
create mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/patron-title.inc
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list