Bug 4330: Wrong address for Free Software Foundation

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
(cherry picked from commit 93d4c90a681d527044567bbbb7d5f81aec31a6b5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 4330: Missing License Statement

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
(cherry picked from commit 40bd14e0ea98152377a0a416482fe0227fee17bd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
checked that, with Libravatar OK things are still OK
(cherry picked from commit 4f49dc5ad05289820916c6fd879e70f3adeee253)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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@bsz-bw.de>

Successfully tested with default encoding utf8.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1b49f54b8828c7ee4ecba8856886f9662d9712d8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 7242 : Fixing typo in a div

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fda4af9a3ee582a483695ba0cab4061101e2d56d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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@biblibre.com>
(cherry picked from commit fd949453e86b2def06b471a3b3bfa293bce78a75)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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@nekls.org>
Tested 1-3, no troubles found.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 573b9275a6ab3fa1c0b24ce202ab69c44238b963)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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@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@cpbibliography.com>
Verified the existence of the bug, and that the fix works as advertised.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 624b1562d8567dabd23cb4e1ac7e34615e604edc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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@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@gmail.com>
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@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 862b6ee90dfad9d00fc29bc4dc2d3cf8e0159815)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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@gmail.com>
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@gmail.com>
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@kohaaloha.com>
(cherry picked from commit 03dffd8374ee3df9836346b56d56d9bdd2e32e31)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0fd451060eb2cd88d3f44e68dfa8da6e9ae2956d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit f56e6c0a58145ed3a30341bf0df85e17cde0135d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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@catalyst.net.nz>

Minor change: I fixed a typo I spotted
(cherry picked from commit fab2d8b0abdb2a1af711d8b2ee6f287eef35d91d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6303: Display Organisation and Parent Organisation names when viewing a borrower of type organisation

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@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@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@biblibre.com>
(cherry picked from commit 2b2e544f054acc5c220dfca035554e2d13b27cdf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
6699 Add not-empty check for warnings from load_sql in Installer

Eliminates fake warnings "Something is wrong on line 530".

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 7bbc3580675a151bc08e884c206dc4e17bee6f04)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6699 follow-up

The warn $error will issue this message if there is a message.
It's because how warn $blabla works : it does not work, you have to add ""
(cherry picked from commit 869f83a4cee1e0824b5fecb3e9fa9a9d7ae807e5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 7105: Bad request in GetSubscriptions

If $string or $issn is passed to GetSubscriptions, the request is false.
See Bug 5864, especially the last comment from Frédérick Capovilla.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 32317878c0e2cbf858e8a21466d01ab3c4df3aec)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>