Bug 10225 - If an item isn't editable, don't show the onclick Edit/Delete menu

The user should not be shown edit/delete links when clicking on a row in
additems which they cannot edit because of the IndependantBranches
setting. This patch adds a class to the row to exclude such rows in the
JavaScript onclick handler.

To test:

- Turn IndependantBranches on and edit items for a title which
  has holdings from various branches including your own.
- Click a row for an item which is held by your library. You should see
  the "Edit/Delete" links appear.
- Click a row for an item which is held by another library. No links
  should appear.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All test pass

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Changes to the templates include no string changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit b36d3bc796fd1b0a4db32729c994287425f10326)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 1a8db0ba7d62a70cd6b49ee705a5db9b11ad7672)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Conflicts:
	koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
Language update for 3.10.6
Release notes for 3.10.6
Bug 10293 - Bug 9930 needs to be reverted for 3.10.x

The patch for bug 9930 needs to be reverted for 3.10.x, as the patron
self registration feature is not part of 3.10.x. With the patch applied,
the OPAC patron details link may redirect to a non-existent page (
opac-memberentry.pl ).

Test Plan:
1) Set OPAC to use CCSR theme.
2) Log into the OPAC.
3) Click the link for your username.
4) Click the "my personal details" tab.
5) Note the error page you get
6) Apply this patch
7) Refresh the page
8) You should now see the user details update page

This reverts commit e5186d6d784c1fdd8d12c6e93e163d0b9e10cc0e.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Bug 10186: Fix a typo in subscription-add.tt : 2/years should be 2/year

In subscription-add.tt dropdown list for periodiciy, the description for 9 value should be "2/year" (2 issues each year)
At present, if the option value is selected, it is "2/years".
This patch supresses the "s" after "year".

To test :
- in a subscription, change periodicity to "2/year"
- save the subscription
- reopen it and check the value is labelled "2/year"

Signed-off-by: David Cook <dcook@prosentient.com.au>

Trivial change. Works as described.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit cf2f95f0607f5bc20f757a6de7effd93334576fa)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 684421809a332bde4778ab06e6cb2bfd09b3b599)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 684421809a332bde4778ab06e6cb2bfd09b3b599)
Bug 10191: Close 2 option tags in unimarc_field_115a.tt and unimarc_field_116.tt

This patch close 2 option tags in unimarc_field_115a.tt and unimarc_field_116.tt.

To test :
- in a UNIMARC Koha instance, edit a record
- open the plugin for 115a subfield
- check the "Form of release - visual projection, motion picture" option
  list is correct, especially the value "other film type"
- open the plugin for 116 field
- check the "Technique (prints) 2" option list is correct, especially
  the value "lithography"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

I did not test this in Koha, but it's a simple change of one character
which I'm comfortable with signing off on.

I don't know if this counts as a string change or not, since the string
was previously mixed with a malformed tag.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests and fixes an obvious problem in the HTML.
I checked the po files - currently the strings appear as:
"other film type/option> %s "

So in theory it's possible to translate them correctly even
if the standard templates now are not correct.
Probably has to wait for 3.14.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 9b92e35492c74cb2bd7c1d386bc5d3542bbd7123)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 2fd42fa89c0eff4e3b26835045a6b64b0b6862a6)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 2fd42fa89c0eff4e3b26835045a6b64b0b6862a6)
Bug 10178 - Typos in plugins for 006 and 008 in MARC21

Well, not only typos. There is also a NEW update for
006/8 Music on April 2013. And 3 missing values in 006.

Revised descriptions and labels, source LOC page.
Strings spell checked.

To test:
1) Apply the patch
2) Test that MARC21 006 and 008 value builders works
properly.

Small string changes.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests pass

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
XML changes only, passes all tests.
Contains string changes, so should go into 3.14.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 10098fbcc55aac04d7986a8ab799f1bf729172e5)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Trivial string changes that didn't make it before string freeze. Patch applies cleanly on 3.12.x. It shouldn't go into older releases I guess.
(cherry picked from commit deedd99d92c2c3cf6932eeffd2d9c270142055d4)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit deedd99d92c2c3cf6932eeffd2d9c270142055d4)
Bug 10083 [3.10.x] In Transit string doesn't get translated in the staff interface

For some reason this text inside a <td> isn't getting picked up by the
translator unless it's inside a <span>. This patch adds the span and
tidies up the text.

To test, apply the patch and "translate update" a translation. Searching
the po file for "In transit from" should return a result from detail.pl.

Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Bug 6399 - tooltip for tags that says 'separate by comma'

Some sites split tags on spaces, some on commas. Since Koha splits on a
comma, we should make that clear to the patron. This patch adds
additional text to the "New tag(s)" label.

To test, enable TagsEnabled, TagsInputOnDetail, and TagsInputOnList.
Click "Add tag" on both OPAC search results and an OPAC detail page.
Confirm that the revised label appears correctly.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
all tests pass

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass. There are some more places where we can
add tags to multiple records at once, I noted them on the bug.

http://bugs.koha-community.org/show_bug.cgi?id=10259

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 14ac6cf11b19c3f1ca64c58bf520e7a9e5cf2f37)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Even if tha patch doesn't add a tooltip, as it is just a string change that clarifies the addition of tags it should be applied to stable.
(cherry picked from commit e776b28e31052553c994d63162a36263b3ada259)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit e776b28e31052553c994d63162a36263b3ada259)
Bug 10288 - Fix a tiny typo on "Pending offline circulation actions"

To test:
- Apply the patch
- Go to <intranet>/cgi-bin/koha/circ/circulation-home.pl
- Verify that is says "There are no pending offline operations."
- Sign off

Or just have a look at the patch...

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 3e76b1ac71a9652c06ddac09d81dcef4e5adaddf)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit de32e8d6e849ecfc13d4635c776749f5b5d4ef3e)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit de32e8d6e849ecfc13d4635c776749f5b5d4ef3e)
Bug 10367 - [3.10] update the rules and control file for wheezy

This updates the control file to use tinymce rather than
tinymce2, as tinymce2 is deprecated and no longer in Debian.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
This was written and tested by the packages maintainer.
Bug 10036 - adding header search to additem page

The add item screen lacks a header search form. This patch adds the
cataloging header search include to additem.tt.

To test, apply the patch and add items to or edit items of an existing
record. The header search form should appear with options for cataloging
search and circulation.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 646015c6471fa3d248696a55b6f18d268b5a2f60)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This should have been tagged as a bugfix...
(cherry picked from commit d22fb794dcc977c096665c4aa44ffc2185af7d46)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit d22fb794dcc977c096665c4aa44ffc2185af7d46)
Bug 9507: prevent submit: refactor some code in a js file

This patch refactors some code in a js file.

Test plan:
On acqui/neworderempty.pl, acqui/orderreceive.pl and
serials/serials-edit.tt try to scan a barcode (or press enter) on the
form and check that it is not sent.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Have to note that the code for IE9 does not work. Before and after this patch.
If we refactor code, it would have been nice to resolve this too.
But I do not oppose pushing this patch.
The test uses 'an ancient Netscape property' window.Event (uppercase!) to make
the distinction between browers and event models. Some more documentation here
would be welcome too.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 9e4c289d3f68aaab5d47172940e30fba0819804e)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Refactoring, but needed for 10310 inclusion
(cherry picked from commit c8ea6ba025455a26a585733fdb214942a9823a45)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit c8ea6ba025455a26a585733fdb214942a9823a45)
Bug 10310: Prevent submitting form with enter does not work with IE

I am not able to test this patch with IE...
I tested it with Chromium and FF and it works great.

This patch can be tested on the neworderempty.pl page
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit efdf30bc476ab130b0dc4767ba38d68208eb2ca7)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 84481e79527d8ad1c5a3393b716c17f550736857)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 84481e79527d8ad1c5a3393b716c17f550736857)
Bug 10310: Followup Prevent submitting form with enter does not work with IE

Check e.target.type instead of using jQuery.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit c4978ef178746df06333c6704ea9e6f888b4b9ff)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 5cea7144bc50477f8518ae47e78282de287c1a23)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 5cea7144bc50477f8518ae47e78282de287c1a23)
Bug 10313 Fix link to invoice from orders

Need to have invoiceid and pass it to retrieve selected
invoicenumber. Wrong data passed causing incorrect
records to be displayed

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 3f4d31309203b85b5415788967d4c8cf3ce83570)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
There's a small POD error, I'll try to provide a followup for it.
(cherry picked from commit ed34661870e50e04acf61c7f687343b9a2a8f1da)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit ed34661870e50e04acf61c7f687343b9a2a8f1da)
Bug 10120: Adding a syspref to control if overdue charges are updated on return

On by default.

To Test

1/ Create an overdue item, that should get fines
2/ Return the item
3/ Check the borrowers record to see if the fine has been added/updated

Apply patch
1/ Make sure preference is set to do
Repeat steps 1-3 above

2/ Switch the preference to don't
Repeat stes 1-2
3/ Check the fine hasn't been added/updated

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass, works as described.
I would categorize this a bug fix for libraries that don't want
the new changed  behaviour that was introduced by recalculating
fines on return.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit fc61bd30186b0305579c5dee0a14f9d2733cd5db)

Solved conflicts in:
	installer/data/mysql/sysprefs.sql
	installer/data/mysql/updatedatabase.pl
and changed DB version number.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 1c6ab7f78575e7cc4eaee3eca397002ba9e23c8e)

Solved conflicts in:
	installer/data/mysql/sysprefs.sql
	installer/data/mysql/updatedatabase.pl
and changed DB version number.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 1c6ab7f78575e7cc4eaee3eca397002ba9e23c8e)
Bug 10120: DBRev 3.10.6.001
Bug 10284: Add missing spaces between label and content in XSLT view (780/785)

To test:
- Check OPAC and intranet XSLT view for a record that contains
  780 and 785 fields.
- Verify there is no space between the label and the content of the
  field.
- Apply patch.
- Verify the display both in intranet and OPAC is a little nicer now.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 4c1c323232cd303c9c1e0f02c83871e1e6fcd62d)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit b459eab4c89cf507ae3108194c2ec159b04672aa)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit b459eab4c89cf507ae3108194c2ec159b04672aa)
Bug 7368: Correct three typos in history.txt

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 342463b5796825e8dd941e575694e8e4be6aa274)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 09a17abfda2f0f0a01d7b5f807e73dd77bfcb856)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 09a17abfda2f0f0a01d7b5f807e73dd77bfcb856)