]> git.koha-community.org Git - koha.git/log
koha.git
13 years agoBug 6953 - Value builder for NORMARC 007 does not show further options
Magnus Enger [Sat, 1 Oct 2011 15:43:55 +0000 (17:43 +0200)]
Bug 6953 - Value builder for NORMARC 007 does not show further options

A previous commit introduced a missing TT control structure, but
forgot to include the trailing "\" for multiline JavaScript.
This patch simply adds the missing "\".

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c7b77c789ee17515931e9d54a23d85234ed9e505)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6600, Library name linking wrong if current location is different
Owen Leonard [Tue, 19 Jul 2011 13:12:30 +0000 (09:12 -0400)]
Fix for Bug 6600, Library name linking wrong if current location is different

GetItemsInfo in Items.pm includes this join:

LEFT JOIN branches ON items.homebranch = branches.branchcode

This means that the branch URL (from the branches table) comes out
as the URL for items.homebranch, thus the URL in the holdings
output is the item's home branch even though the display might
be showing a different current location.

This patch changes the join to use items.holdingbranch. The join
was originally added to fix Bug 3702, and based on the description
of that feature I'm assuming this change is not harmful to other
usages. However, it does make the assumption that the item's
current (holding) branch is the branch we want to see information
about.

Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6ade95d5db2f2b6a0a2d47d53aecae26a9997243)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBZ6268 follow-up for the form
Paul Poulain [Wed, 29 Jun 2011 19:10:34 +0000 (21:10 +0200)]
BZ6268 follow-up for the form

This follow up fixes cait request to calculate the form like the budget

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1e16c7cbabf1b53be061d661dc02b27d4f271a3c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6268: (MT #6408) Bad Total in basket.pl
Paul Poulain [Mon, 23 May 2011 09:27:07 +0000 (11:27 +0200)]
Bug 6268: (MT #6408) Bad Total in basket.pl

The total_est_gste or gsti is computed on the total_rrp_gste or gsti.
But in the budget this amount is the summ of discounts computed for each line.
Due to the rounding to 2 decimal places this produces a difference in Funds view with Total sublevels spent.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0d0b3ef9c2840633ae9860b66babeba3cb453b1b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6076: acqui pdf error when marcxml wrong
Jonathan Druart [Fri, 8 Jul 2011 09:13:41 +0000 (11:13 +0200)]
Bug 6076: acqui pdf error when marcxml wrong

when marcxml is wrong the PDF is not generated. There is a Perl error
because
the biblio can't be retrieved.
This can be workarounded with a eval when decoding the marc

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1f0e3d7a4ba5265e586c0f940c46a63d04ab1e3f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBZ6074: setting import flag when staged file imported in aqbasket
Paul Poulain [Tue, 5 Apr 2011 20:11:15 +0000 (22:11 +0200)]
BZ6074: setting import flag when staged file imported in aqbasket

Lines issued from a staged file have a flag that can be set when the order has
been added in a basket. It's set when a staged file is imported into the
catalogue, it should be set also when a record is inserted through aquisition.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Add order from staged file to a new basket
- Add single order from one item
- Import rest using the bulk feature
- Staged file will no longer be shown after all titles
  have been ordered and import_status in import_batches
  is correctly  set to 'imported'

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b5a3f485ab861b1d0330d1c4a3c4d17ba97f4863)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug_6974: bugfix: do not create empty record before building input for new biblio
Srdjan Jankovic [Thu, 6 Oct 2011 00:55:47 +0000 (13:55 +1300)]
bug_6974: bugfix: do not create empty record before building input for new biblio

It messes up javascript default values

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4c1ea37e6366fc7a17ece602f73de4d7ebfbd279)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6958 : Fix for leading spaces being stripped on translation
Chris Cormack [Mon, 3 Oct 2011 21:43:45 +0000 (10:43 +1300)]
Bug 6958 : Fix for leading spaces being stripped on translation

This will re-add any leading spaces, so formatting is not messed

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
- all examples from the bug report are fixed now
- verified system preferences are still translated
- verified xslt displays are still translated
- verified javascript alerts are still translated
- verified switching languages works

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit 873091dcc84de8856a1da936ab0045351273cc53)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6867: Date last seen ignored on import
D Ruth Bavousett [Tue, 4 Oct 2011 14:37:33 +0000 (07:37 -0700)]
Bug 6867: Date last seen ignored on import

The date last seen field (952 $r) and replacement price date (952 $w) were being
ignored on import, being replaced with NOW() as a hardcoded value.  This patch will
allow a value to be imported, but if none is, it will use the ISO date of import
as a default.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b1e6aadf56fa8036eb9dc9e55b4bb6a50e5d26a8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6633: SCO return button doesn't work
Ian Walls [Tue, 27 Sep 2011 18:09:45 +0000 (14:09 -0400)]
Bug 6633: SCO return button doesn't work

A template toolkit scope issue was preventing the Renew button from working properly, as well as displaying
the fines column even if no fines column header was displaying.

This patch adjusts the scope of several T:T variables on the sco-main template to fix this

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a291cc52ca79ed11e0032e73b380b17f3bf308cb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6733: change branchcode call in Labels to use userenv instead of LoginBranchname
Ian Walls [Wed, 21 Sep 2011 15:08:33 +0000 (11:08 -0400)]
Bug 6733: change branchcode call in Labels to use userenv instead of LoginBranchname

In the 5 places in the label editor, the user's current branch is determined by taking
the LoginBranchname and doing a reverse look up for the branchcode.  This is an unnecessary
query, since C4::Context->userenv has the immediate access to the branchcode; this is how
it's summoned in all other points in the Koha code.

This addresses bug 6673 because, since the move to T:T, the call in tools/manage-marc-import.pl
has used in correct syntax:  $template->param('LoginBranchname') instead of $template->{VARS}->param('LoginBranchname')

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 973371a68b1c2a8af7d90afab8db15bda567f606)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating history and about file
Chris Cormack [Tue, 27 Sep 2011 20:53:34 +0000 (09:53 +1300)]
Updating history and about file
(cherry picked from commit 405ee6844d835322621bad4cfcfa8c359e8878f7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6927-- Typo in C4::Overdues.pm
Liz Rea [Tue, 27 Sep 2011 14:08:33 +0000 (09:08 -0500)]
Bug 6927-- Typo in C4::Overdues.pm

Corrected a small typo in overdues.pm to fix a "Undefined subroutine &C4::Members::checkoverdues called at /home/koha/kohaclone/C4/Members.pm line 511." when making calls to GetMemberDetails

This fix suggested by Elliot Davis of UT Tyler, and he did the testing -- I'm just submitting the fix to master for him.  :)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 085de44ebdc5bf6431c59b3e60af0277891cd19d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6872 - Can't set default SMS messaging options for patron category
Owen Leonard [Thu, 15 Sep 2011 13:42:38 +0000 (09:42 -0400)]
Fix for Bug 6872 - Can't set default SMS messaging options for patron category

Passing SMS driver preference value to the template so that SMS
options can be displayed when appropriate.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5d5c4a67ec5c91770583edb38ce0213dfa6119c7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6801: checkoverdues returns unnecessary fields, causing slowness
Ian Walls [Wed, 31 Aug 2011 18:43:09 +0000 (14:43 -0400)]
Bug 6801: checkoverdues returns unnecessary fields, causing slowness

Explicitly specifies which fields to return in C4::Overdues::checkoverdues
SQL:  all of biblio, items, and issues, and everything in biblioitems
EXCEPT marc, marcxml and timestamp.

Bug 6801: member details page taking long time to load when many checkouts present

This patch removes the call to GetMemberDetails in build_issue_data; this heavy-weight
subroutine was being run for every single item a patron (or their relatives) have checked out.
Instead, the borrowers first name, surname and cardnumber are added to the GetPendingIssues query.
I believe this is reasonable since GetPendingIssues can now return issues for multiple borrowers.

Also corrects the $borrowernumber used for GetIssuesCharges and CanItemBeRenewed; was using the borrower whose
page we were on, NOT the borrower of that specific item (which would be different in the Relatives Checkouts tab).

Template calls to [% scope.borrowername %] are now broken up into [% scope.firstname %] [% scope.surname %].

Signed-off-by: Liz Rea <lrea@nekls.org>
On my test data, a patron with 180 checkouts (without this patch) would take more than a minute to bring back the circulation.pl and moremember.pl pages.
With this patch, the time is reduced to 5 or so seconds.

Big ups to Ian for tenaciously hunting this one down.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4841: biblio-level itemtypes not searchable in advance search by itype
Larry Baerveldt [Thu, 22 Sep 2011 20:36:05 +0000 (16:36 -0400)]
Bug 4841: biblio-level itemtypes not searchable in advance search by itype

Mapping 942$c into itype index along with 952$y; this allows for biblios without any items, but with a biblio-level itemtype to be retrieved in search. This is particularly useful for E-books or Serials without barcoded items.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d5a886201cd5e2f7615b92ad727ba136eb105bab)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdding new developer to history
Chris Cormack [Mon, 26 Sep 2011 01:40:13 +0000 (14:40 +1300)]
Adding new developer to history

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6465 - Errors in UNIMARC plugins for fixed length fields (for | and space) (T...
Janusz Kaczmarek [Sun, 5 Jun 2011 21:41:03 +0000 (00:41 +0300)]
Bug 6465 - Errors in UNIMARC plugins for fixed length fields (for | and space) (T::T issue)

A corrected version of the patch of 6 June 2011.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0d480bbf5cd7c392c1937fe29c7f7bd4e5fe3fc8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFixing a broken test
Chris Cormack [Sun, 25 Sep 2011 22:55:58 +0000 (11:55 +1300)]
Fixing a broken test
(cherry picked from commit 7244d5060be46f0b7154b897d28997970774957d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug:6781--Log membership renewal
Meenakshi.R [Mon, 29 Aug 2011 11:06:25 +0000 (16:36 +0530)]
Bug:6781--Log membership renewal

If patron related logging is tuned on, log membership renewal

Signed-off-by: Amit Gupta <amit.gupta@osslabs.biz>
Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8b75f5b38c00609299d7b6ed14bb5a08540f2675)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6649 Allow help screens editing
Frédéric Demians [Sat, 17 Sep 2011 07:09:23 +0000 (09:09 +0200)]
Bug 6649 Allow help screens editing

edithelp.pl hadn't been updated to allow help screen editing.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Only a note: Apparently you need to be 'superlibrarian' permission
to edit help pages.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f640a3ea5fdd85695ff7a75240c830369b5aed73)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6205 - if an include doesn't exist, fall back to en
Robin Sheat [Thu, 22 Sep 2011 03:32:24 +0000 (15:32 +1200)]
Bug 6205 - if an include doesn't exist, fall back to en

If a language that doesn't exist gets accessed, then it will fall back
to en for the templates, but not for the includes, so everything still
dies. This allows the process to work in this case too.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
I confirm the bug and the solution. This issue occurs when templates are
partially translated. The main template (.tt) is found for a specific
language, so this language is returned by themetemplate. But in the main
template, some include files (subtemplates) are referenced that can very
well not exist if the translation process had failed to generate them.
This kind of failure is reported by 'translate' script. It's very easy
to miss it, but it's the translator responsability to check it.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 62b76aa98c4f30ae32cb76ba0348e94d31e8464f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6871 - add schema and sql library reports to guided reports sidebar
Liz Rea [Thu, 22 Sep 2011 18:59:11 +0000 (13:59 -0500)]
Bug 6871 - add schema and sql library reports to guided reports sidebar

This patch adds links for schema.k-c.org and the sql report library to the guided reports sidebar.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9f688ab5bc84b3522002929c5f65f37581ec1749)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6773: circ/ysearch.pl is unlimited
Joy Nelson [Fri, 23 Sep 2011 02:36:48 +0000 (22:36 -0400)]
Bug 6773: circ/ysearch.pl is unlimited

Added a LIMIT 10 to the SQL statement
Edited the circulation.pref stating that autocomplete returns the first 10 results at a time

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 38ca8d6de18e630751dcae313d66f8546934fb5c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6884, Improve TinyMCE configuration on Koha News page
Owen Leonard [Fri, 16 Sep 2011 14:27:24 +0000 (10:27 -0400)]
Fix for Bug 6884, Improve TinyMCE configuration on Koha News page

- Increases the width of the editor to fill the space provided
- Adjusts the layout of the toolbars to better fit the space
- Adds a custom editor stylesheet to make the contents of the
  editor better match the expected output

In changing the toolbar configuration I chose to make the display
of each button explicit rather than assuming a default set of
buttons and adding or subtracting from that. I think this is
clearer for someone approaching the configuration trying to under-
stand how buttons are displayed. I also chose to use the
shorthand "|" instead of "separator" for brevity. This last change
is the only one made to the edithelp configuration.

[2011.09.20] F. Demians. This patch is compatible with bug 6649 patch,
fixing help pages editing, and so could be applied before or after it.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3c0883fac72368814e527325fc4e42d59f1339fc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6460: alternative fix, updating template and script instead of C4::Log
MJ Ray [Thu, 22 Sep 2011 18:27:43 +0000 (19:27 +0100)]
Bug 6460: alternative fix, updating template and script instead of C4::Log

Add some test cases and fix a bug in C4::Log found by in review.
Thanks-to: Katrin Fischer.
Signed-off-by: Liz Rea <lrea@nekls.org>
Passes test, interface works as expected.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a746e11c1462df4567c007c8e73cf14a55af5ddb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6679 : Enable Critic tests for authorities and fixed resulting warnings
Chris Cormack [Wed, 21 Sep 2011 03:52:23 +0000 (15:52 +1200)]
Bug 6679 : Enable Critic tests for authorities and fixed resulting warnings

Signed-off-by: Ian <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e1bb9e5137110c636334d4039b46c68bfd615b42)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6824 - correctly check basket viewing permissions
Robin Sheat [Wed, 31 Aug 2011 03:22:38 +0000 (15:22 +1200)]
Bug 6824 - correctly check basket viewing permissions

Previously you couldn't view baskets that you hadn't created, unless you
were superlibrarian due to a bug. Now people with the right permissions
can see the baskets.

Applies to both 3.04.04 and master.

Signed-off-by: Brendan <info@bywatersolutions.com>
Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9966d218ae1705b272841c721bf4355437ba5a44)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6755 follow up, fixing broken POD
Chris Cormack [Thu, 22 Sep 2011 23:33:00 +0000 (11:33 +1200)]
Bug 6755 follow up, fixing broken POD
(cherry picked from commit 8e7b1636086b6689e72905c5008841e585c04e8e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6755 follow up
Alex Arnaud [Thu, 22 Sep 2011 09:05:13 +0000 (11:05 +0200)]
Bug 6755 follow up

Use C4::Templates::_get_template_file instead od C4::Output::_get_template_file
in preferences.pl

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d60732119c95eeb27af0a79adec4fcfa6d9c966e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6755 Problems with switching languages
Frédéric Demians [Thu, 25 Aug 2011 13:01:19 +0000 (15:01 +0200)]
Bug 6755 Problems with switching languages

This patch solves the situation that news is in another language than
the Koha interface AND makes that themelanguage routine is always called
the same way in order to prevent mixed display.

It fixes also a bug related to language preselection based on web
browser prefered language.

September 9: Adjusted with input of Frederic Demians.

Septembre 10: Avoid circular dependency, as pointed by Chris Cormack.
Templates related functions are moved from C4::Output to C4::Templates

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6881 - Not able to accept a suggestion (typo in template)
Chris Cormack [Wed, 21 Sep 2011 22:33:34 +0000 (10:33 +1200)]
Bug 6881 - Not able to accept a suggestion (typo in template)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Easy fix, works great.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4029e8ed755b58c7b3a25c162838c20f5a6ad149)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 3704: SIP Checkin of not checked out item returns error without reason
Katrin Fischer [Fri, 2 Sep 2011 14:21:23 +0000 (16:21 +0200)]
Bug 3704: SIP Checkin of not checked out item returns error without reason

Checking in an available item returns an error (which is correct) without
giving a reason for the failure as screen_msg (aka AF field in SIP2 is empty).

Based on code suggested by Patrick Langer <patrick.langer@easycheck.org>

Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a2ee6443b9643ad0780ad62ef63d0a06d5c674f0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug_4831: Use unitprice (actual cost) when totalling spent amounts for "All available...
Srdjan Jankovic [Wed, 7 Sep 2011 04:02:21 +0000 (16:02 +1200)]
bug_4831: Use unitprice (actual cost) when totalling spent amounts for "All available funds", as in "Already received"

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
- add new fund for an active budget
- order item, price 8.00
- check funds page and acq home: committed amount should be 8.00
- receive item, enter actual price 10.00
- check funds page and acq home: spent amount should be 10.00

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4fb88deaa7a0ada50480751cbfadcf1dde75d8eb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6900 - line break between available and reference items
D Ruth Bavousett [Wed, 21 Sep 2011 15:50:19 +0000 (08:50 -0700)]
Bug 6900 - line break between available and reference items

This patch adds a conditional line-break in the availability section of XSLT results.

Signed off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 65e65d7c37e052e6fa8253001f47c497e22e6fd3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6360 - add some more sounds to some happenings on returns
Robin Sheat [Tue, 13 Sep 2011 03:50:26 +0000 (15:50 +1200)]
Bug 6360 - add some more sounds to some happenings on returns

This adds an alert sound to various events around transfers and holds
when items are being returned, to make it more apparent that attention
is needed.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6e91a453aa5a693c7e15c6e82f14e66471b3ec98)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug_6576: Submit when changing framework rather then reloading
Srdjan Jankovic [Mon, 12 Sep 2011 09:09:49 +0000 (21:09 +1200)]
bug_6576: Submit when changing framework rather then reloading

TransformHtmlToMarc(): changed interface - no point passing params when
they can be accessed from $cgi

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c453a45f384ce87a8af4ab9339fb877b11a79105)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6679 : fix 3 perl::critic warnings
Maxime Pelletier [Tue, 20 Sep 2011 21:40:36 +0000 (17:40 -0400)]
Bug 6679 : fix 3 perl::critic warnings

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6200d4ae21a6e780fe221d0f873395f5d60c063c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6679 Fix scripts in admin & acqui to pass Perl::Critic
Chris Cormack [Mon, 8 Aug 2011 08:29:05 +0000 (20:29 +1200)]
Bug 6679 Fix scripts in admin & acqui to pass Perl::Critic

Scripts in admin & acqui subdirectores weren't passing t/00-testcritic.t. This
patch add admin & acqui scripts to test case and fix various errors related to
Perl::Critic compliancy.

- Fixing a style error to pass Perl::Critic, plus silencing a warn
- More style errors, plus fixing a security issue
- Explicitly using Carp

Contrary to common belief, subroutine prototypes do not enable
compile-time checks for proper arguments. Don't use them.

Defining a named sub within another sub, does not prevent that
subroutine being global

Signed-off-by: Frédéric Demians <frederic@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7cdea5de355e853f25300821cc641672443177de)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6842 - Branch transfer limits broken
Owen Leonard [Thu, 15 Sep 2011 14:12:27 +0000 (10:12 -0400)]
Fix for Bug 6842 - Branch transfer limits broken

- Changing library select form so that chosen library is preselected
- Changing pager <form> to a <p> so that nested form tags don't
  conflict. It was the addition of the javascript table pager
  which broke the functionality on this page.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- It's possible to select a different library now. The pull down shows
the chosen library correctly.
- I can make changes and save them without any problems.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 377f174b0674b009945036c3ac3724378e12e9c5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6766 - Template variable scope errors in holds template
Owen Leonard [Tue, 23 Aug 2011 16:18:44 +0000 (12:18 -0400)]
Fix for Bug 6766 - Template variable scope errors in holds template

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 06a939178ccbbcf1809c1b1e7bc1d12124165ff3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5675 : CheckReserves not honouring item level itemtypes preferences
Chris Cormack [Sun, 28 Aug 2011 23:21:24 +0000 (11:21 +1200)]
Bug 5675 : CheckReserves not honouring item level itemtypes preferences

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
With item level itypes activated only the item for which holds were
allowed in circulation rules triggered the hold notice on checkin.

Also checked that biblio level itype still trigered correctly.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1a54fc3642ff885a852d197161974233a3fcf299)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating Version Number to 3.04.05.000 v3.04.05
Chris Nighswonger [Mon, 26 Sep 2011 23:47:59 +0000 (19:47 -0400)]
Updating Version Number to 3.04.05.000

13 years agoRelease Notes for 3.04.05.000
Chris Nighswonger [Mon, 26 Sep 2011 23:46:18 +0000 (19:46 -0400)]
Release Notes for 3.04.05.000

13 years agoSuite trad fr-FR
Frédéric Demians [Mon, 19 Sep 2011 17:51:23 +0000 (19:51 +0200)]
Suite trad fr-FR
(cherry picked from commit 001d9606fe03646e54866bb893b687f62cae28d8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6883 Update userpermisions.sql fr-FR file
Frédéric Demians [Mon, 19 Sep 2011 05:25:17 +0000 (07:25 +0200)]
Bug 6883 Update userpermisions.sql fr-FR file
(cherry picked from commit 44d5c2722ea6910ab4a45fb108631220a55aea08)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoMise à jour fr-FR et da-DK
Frédéric Demians [Sat, 17 Sep 2011 19:36:38 +0000 (21:36 +0200)]
Mise à jour fr-FR et da-DK
(cherry picked from commit 65c3f1822b45b543d15f94e340b99f3f59e56431)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago3.4.5 .po files update at String Freeze
Frédéric Demians [Fri, 16 Sep 2011 08:53:56 +0000 (10:53 +0200)]
3.4.5 .po files update at String Freeze
(cherry picked from commit 4cc7756113db3cbf607143cacf7cca50ebd54b1b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug_6318: Always give predefined fields drop downs on label layout edit
Srdjan Jankovic [Mon, 5 Sep 2011 08:44:14 +0000 (20:44 +1200)]
bug_6318: Always give predefined fields drop downs on label layout edit

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d43aa87d35561266275d840fe890009d8a231772)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Tue, 13 Sep 2011 13:51:01 +0000 (09:51 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in
messaging preferences include.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7cc412d337245b5ffbbb94b5c503e6afd989a3ed)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 1 Sep 2011 15:14:50 +0000 (11:14 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in MARC
editor. Modifying script to stop tag attribute markup from being
passed to the template directly in favor of using template logic.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7e8381c78c6ccffbe6d41d700fa46aa3ed8025ff)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Tue, 13 Sep 2011 12:57:25 +0000 (08:57 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Correcting doc-head-open.inc (again?).

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 143e3e6541b829c8c7e476526348502b05b204ee)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 25 Aug 2011 19:11:09 +0000 (15:11 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Correction for opac-messaging.tt tops tag attribute markup from
being passed to the template directly in favor of using template
logic.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4324377c55f3c82f724fc08c364eb678ab0f5ffa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 Follow-up for memberentrygen.tt
Katrin Fischer [Wed, 11 Aug 2010 00:27:39 +0000 (02:27 +0200)]
Fix for Bug 6458 Follow-up for memberentrygen.tt

The registration date field would show up twice after applying the first
patch for memberentrygen.tt.

This patch fixes the problem.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8a4dbae0efee89728de8bc5a63339828498f9798)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Fri, 26 Aug 2011 13:07:15 +0000 (09:07 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in
member entry form.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Fixes lots of problems. Spotted one small problem. I am sending a follow-up.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e8a876614eddde3025477e228d4ccf533d3cc683)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5252 - Phone labels on patron creation
Nicole C. Engard [Tue, 9 Aug 2011 15:20:47 +0000 (11:20 -0400)]
Bug 5252 - Phone labels on patron creation

The labels for emails on the patron forms say 'primary' and
'secondary.' This patch does the same thing for the phones.
phone is now 'Primary phone', mobile is now 'Secondary phone',
and 'phonepro' is now 'Other phone'. This way the type of phone
does not matter and the phone that the patron wants to be called
at the most is the 'primary.'

This is just a step in the direction of fixing Bug 5252, not a
complete fix.

This patch also updated a stray reference to Home Email.  Both the
OPAC and staff client are updated with this patch.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0a71367dc2113de860ca25f735a4996e170e44d6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago6829: Remove two warnings for opac-MARCdetail
Marcel de Rooy [Thu, 1 Sep 2011 12:07:40 +0000 (14:07 +0200)]
6829: Remove two warnings for opac-MARCdetail

Remove two warnings from logfile by adding simple checks.

Sept 1, revision: Clearing another warning (thx Owen) too.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit caae541135dedb5d0ccddbf8ffd31887f802332d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 2891, cannot manually enter date at reports/issues_stats.pl
Owen Leonard [Mon, 22 Aug 2011 16:23:05 +0000 (12:23 -0400)]
Fix for Bug 2891, cannot manually enter date at reports/issues_stats.pl

Removed unnecessary readonly attribute from date fields

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8474059769ae921c9dfb8249bc774ade606785fa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 6677 - remove reference to 'debarred'
Nicole C. Engard [Sat, 6 Aug 2011 11:15:11 +0000 (07:15 -0400)]
bug 6677 - remove reference to 'debarred'

The patron stats wizard had 'debarred' in the pull down
for status, but it's called restricted everywhere else.
This patch changes debarred to restricted.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 92e71131faf55e719f84c6e29314f5abc5714b57)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6841 - A member with cataloging permissions cannot change branches (when independ...
Liz Rea [Tue, 6 Sep 2011 18:00:51 +0000 (13:00 -0500)]
Bug 6841 - A member with cataloging permissions cannot change branches (when independent branches is set on)

This patch does a couple of things.

1. Changes permission over all to set branch printer (change branch/Set Library) from "circulation" privileges to "view catalogue" permissions. Reasoning: anyone who has privileges to view catalogue could reasonably be expected to perhaps need to change the set branch, but you might have people who don't have circulate permissions who need to change the branch, centralized cataloguing, for example. Those people would never circ and wouldn't need circ privileges, but *would* need to be able to change the set branch.
2. Changes the template flags to see the "Set Library" link with independent branches set from "manage users" to "manage users or edit catalogue." Reasoning: even with indy branches on, there might be reasons for catalogers to be able to change the set branch (that reason was the impetus for this patch in the first place).

To test:
Create a user with only "View Catalogue" Permissions (no circulate permissions), that user should be able to change set library with Independent branches OFF.

With independent branches on, give a user edit catalogue permissions. That user should be able to change set library.

I want to add that this patch was specifically written in response to chris_n's bug report. It may not be practical for these changes to be in mainline, but I haven't thought of any reasons why it would be explicitly bad. That doesn't mean there aren't some, though.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c2015c710355a0ab81306515a70af29e6aef3504)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6620 Ensure autoflush is set on output filehandles
Colin Campbell [Thu, 21 Jul 2011 11:16:22 +0000 (12:16 +0100)]
Bug 6620 Ensure autoflush is set on output filehandles

stdout is by default buffered and a flush is only guaranteed on CR
Sip responses are not CR terminated so we need to ensure autoflush
is switched on  so that the filehandle is flushed after a print
Otherwise this can manifest as self checks running slow or
failing due to timeout (although in the log we see the response)

Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f9ccfae400324fdd88597ff81fba42715e50f19d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6368: unimarc_field_4XX plugin does not work with new templates - corrected
Janusz Kaczmarek [Wed, 18 May 2011 20:35:57 +0000 (22:35 +0200)]
Bug 6368: unimarc_field_4XX plugin does not work with new templates - corrected

[2011.05.19] I confirm the bug and the solution

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 47aee699afbb4ad8aebc84e023a0e5c7fd441ec9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFollow-up fix for Bug 6458, incorrect parsing result in translation processing
Owen Leonard [Tue, 13 Sep 2011 16:30:05 +0000 (12:30 -0400)]
Follow-up fix for Bug 6458, incorrect parsing result in translation processing

Somehow some markup which should have been deleted by a previous
patch has reappeared, messing up the display of the MARC editor.
This patch removes that section again.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 362b82c51d1ff4fe6506f7724e8dac7d0a24ebd0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Tue, 13 Sep 2011 13:33:05 +0000 (09:33 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in
CSV profiles template

Also fixing improperly scoped template variable which prevented
the current profile from being preselected under the edit tab.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9dc11e418a3f48971de92f2722bd564738218c9f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Tue, 13 Sep 2011 13:01:54 +0000 (09:01 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in
budgets admin search form.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit aab0d9fba264ec3e878e339e098b1f3c943e6a6d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing / branches
Owen Leonard [Fri, 26 Aug 2011 20:07:46 +0000 (16:07 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing / branches

Correction for branch admin template stops tag attribute markup from
being passed to the template directly in favor of using template
logic.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3e1203c95e53422015885a2add288d5cbc9f8733)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing / clone-rules
Owen Leonard [Fri, 26 Aug 2011 19:56:00 +0000 (15:56 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing / clone-rules

Fixing improperly nested template logic inside HTML tags in
clone circulation rules form.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8bdab59bbad65bdb4b324fedc79c73b33066b0d3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Fri, 2 Sep 2011 14:14:51 +0000 (10:14 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

There is template logic in manage-marc-import.tt which is intended
to set the "selected" option for the framework chooser ("Add new
bibliographic records into this framework"). However, I can't see
any place in the code which sends the "selected" variable to the
template, and I can't see any circumstance in which a value would
be passed to the template.

This patch removes the "selected" variable from the template.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0d5aaf0a7ca024d4ec5e1b7d554e0d813785fae4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 25 Aug 2011 19:37:25 +0000 (15:37 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Correction in opac holds template. Corrections made are logically
consistent, but I couldn't reproduce the combination of factors
to trigger the "disabled" attribute on the branch selector. In
that respect this hasn't been tested 100%.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 597240e878a2a9808ce103508a42d9ed34a11422)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing / patron-attr...
Owen Leonard [Fri, 26 Aug 2011 14:54:07 +0000 (10:54 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing / patron-attr-types

Correction for patron-attr-types.tt stops tag attribute markup from
being passed to the template directly in favor of using template
logic.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Read the patch and tested the page, didn't find any problems.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e1bbff6b7f9db37714fcdb69b03598600e222237)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 1 Sep 2011 14:53:24 +0000 (10:53 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in the
system preferences editor.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c7c7a09dc49483fa9b9eefb2a24d3bc4aaea5359)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 1 Sep 2011 14:36:50 +0000 (10:36 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in spine
label print template.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ecfa1ddd49bd8de6139cd7200679996b51dabf3c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 1 Sep 2011 14:26:19 +0000 (10:26 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in member
details template.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 550a38143a5898dc7c4ef09be215dcb27aab1034)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 1 Sep 2011 14:06:03 +0000 (10:06 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in
aqplan template.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2c51064ab183abb3761be629efd4169ebef99d4b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 1 Sep 2011 13:40:08 +0000 (09:40 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside markup in header.inc

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7950a8f5af10b905d1a53e14e69eb34ad430d29e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Fri, 26 Aug 2011 20:15:34 +0000 (16:15 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in
branch transfer limits template.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d058b4eee9de75b00d8cb74367bd3ee0bdc2318c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5234 - Remove unused CSS files
Owen Leonard [Tue, 21 Sep 2010 12:35:38 +0000 (08:35 -0400)]
Fix for Bug 5234 - Remove unused CSS files
(cherry picked from commit 2d4d976f3dd5e9b36784562a02da25ae04122d86)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6129 - [3.4.x] this adds an ISSN to serialssolutions URLs
Robin Sheat [Mon, 5 Sep 2011 00:19:50 +0000 (12:19 +1200)]
Bug 6129 - [3.4.x] this adds an ISSN to serialssolutions URLs

If a URL is a serialssolutions URLs that doesn't already have an ISSN
parameter, this adds one on the OPAC.

Author: Srdjan Jankovic <srdjan@catalyst.net.nz>
Author: Robin Sheat <robin@catalyst.net.nz>

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6651 - fix splitting of names when updating to 3.4
Robin Sheat [Sun, 31 Jul 2011 02:26:23 +0000 (14:26 +1200)]
Bug 6651 - fix splitting of names when updating to 3.4

This affects only koha package installations that have multiple
instances running. After this patch, it's worth running the upgrade
again to ensure that everything happened correctly the first time.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ae022e9a22a4631216c43399609d8aae62d23fb5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / results
Katrin Fischer [Wed, 24 Aug 2011 22:40:56 +0000 (00:40 +0200)]
Bug 6458: Incorrect translation processing / results

Removed template toolkit directives from within HTML tags.

Advanced Search > Scan Index > Search results

Additional changes:
- removes entry 'Series Title' from the index pull down as it was the same
  index as 'Series'

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 282a2d60b830b22661cc0324a84b7c17b7b905d1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / suggestion
Katrin Fischer [Wed, 24 Aug 2011 22:09:11 +0000 (00:09 +0200)]
Bug 6458: Incorrect translation processing / suggestion

Removes template toolkit directives from within HTML tags.

Acquisitions > Suggestions

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 06d6cb0ce471f312ffb1ddd92f0ce0bc3ab76a24)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / sco-main.tt
Katrin Fischer [Sat, 20 Aug 2011 17:02:01 +0000 (19:02 +0200)]
Bug 6458: Incorrect translation processing / sco-main.tt

Patch removes templates directives from HTML tags in sco-main.tt

Problems were related to buttons for renewing items.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Before
opac-tmpl/prog/en/modules/sco/sco-main.tt: 135, 222

After, no errors

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4530159ce13eb6ff823d6ef49ad847d92556f356)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / serials/...
Katrin Fischer [Wed, 24 Aug 2011 18:49:23 +0000 (20:49 +0200)]
Bug 6458: Incorrect translation processing / serials/...

Fixes problems with template toolkit directives within HTML tags
for the serials module.

Serials > add/modify subsciption

serial-issues-full.tt seems to be unused?
I couldn't find the page in the serials module.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8f8fc1088a2c5b43ed03fb06c9c842b7c721a838)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing - rotating_collections/...
Katrin Fischer [Wed, 24 Aug 2011 17:43:58 +0000 (19:43 +0200)]
Bug 6458: Incorrect translation processing - rotating_collections/...

Patch removes templates directives from HTML tags in the
rotating collections module.

The module is currently not interated into Koha's staff interface.
Fixing templats to make Jenkins happy.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 22804d6ff6fdc2105644f03d0edca1e4e17d4b72)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / opac-detail.tt
Katrin Fischer [Thu, 25 Aug 2011 16:48:55 +0000 (12:48 -0400)]
Bug 6458: Incorrect translation processing / opac-detail.tt

Patch removes template directives from within HTML tags from OPAC detail view.

Problems were related to the items tabs for holdings, subscriptions, and serial collection.

Fixed the problem spotted by Frère Sébastien Marie - thx!

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6d6c9626274268e82d6fa433894f188b995c913b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / cataloguing/...
Katrin Fischer [Mon, 22 Aug 2011 22:06:00 +0000 (00:06 +0200)]
Bug 6458: Incorrect translation processing / cataloguing/...

Patch removes template directives from within HTML tags from
  - cataloging > new record
  - cataloging
  - UNIMARC plugin for 4XX

There is one problem remaining in addbiblio:

<option value="[% frameworkcodeloo.value %]" [% frameworkcodeloo.selected %]>
    [% frameworkcodeloo.frameworktext %]
</option>

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 27c87aea11243e63c2600d71a154d425b3269c13)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / acqui/...
Katrin Fischer [Mon, 22 Aug 2011 21:47:02 +0000 (23:47 +0200)]
Bug 6458: Incorrect translation processing / acqui/...

Patch removes template directives from within HTML tags from
- acquisitions > new vendor / modify vendor / vendor details
- acquisitions > late orders
- acquisitons > vendor x > basket groups

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d5a9eea5194c97e3874ee830fccf2cdeb1ddf3f8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing - masthead.inc
Katrin Fischer [Sat, 20 Aug 2011 17:38:30 +0000 (19:38 +0200)]
Bug 6458: Incorrect translation processing - masthead.inc

Patch removes templates directives from HTML tags in masthead.inc

Problem was related to library pull down shown when
OpacAddMastheadLibraryPulldown is activated.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Before
opac-tmpl/prog/en/includes/masthead.inc: 83

After no errors

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 637953df93f7090de846e1f274a1e721687a9277)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / 3x reports/...
Katrin Fischer [Mon, 22 Aug 2011 21:25:37 +0000 (23:25 +0200)]
Bug 6458: Incorrect translation processing / 3x reports/...

Patch removes template directives from within HTML tags from
- Reports > Guided Reports
- Reports > Items with no checkouts
- Reports > Patron statistics

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fb7b258ec2220fcf6a86d49132b0224175f0a344)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / authorities.tt
Katrin Fischer [Mon, 22 Aug 2011 21:16:12 +0000 (23:16 +0200)]
Bug 6458: Incorrect translation processing / authorities.tt

Patch removes template directives from within HTML tags from
authorities > modify authority.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1866c4939df4298d561bc9f5fe617644a9955371)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / review.tt
Katrin Fischer [Mon, 22 Aug 2011 21:00:18 +0000 (23:00 +0200)]
Bug 6458: Incorrect translation processing / review.tt

Patch removes template directives from within HTML tags from
Tools > Tags.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1859858af62c6f9923d56b70b29c4c0a3a24f9e4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / overdue.tt
Katrin Fischer [Mon, 22 Aug 2011 20:46:28 +0000 (22:46 +0200)]
Bug 6458: Incorrect translation processing / overdue.tt

Patch removes template directives from within HTML tags from
circulation > overdues.

Problems were related to patron flags pull down and sort by loop for patron attributes.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 18844d6bf1f1c6cf93cbe833067fe747753856b9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing - doc-head-close/open.inc
Katrin Fischer [Sun, 21 Aug 2011 17:58:48 +0000 (19:58 +0200)]
Bug 6458: Incorrect translation processing - doc-head-close/open.inc

Patch removes templates directives from HTML tags in masthead.inc
Fixes all 3 problems now.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 75bfa2a56a857417cf99d605f0f903e14ec0f204)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoWhile testing the commits for 6716 I discovered a couple of missing
Chris Cormack [Mon, 12 Sep 2011 01:57:19 +0000 (13:57 +1200)]
While testing the commits for 6716 I discovered a couple of missing
drop tables, fixed now
(cherry picked from commit d6417257fde4e22252c78f2def21091016db17f3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6517 - [REVISED] koha-create wants "use database" in DEFAULTSQL
Magnus Enger [Thu, 30 Jun 2011 06:47:35 +0000 (08:47 +0200)]
Bug 6517 - [REVISED] koha-create wants "use database" in DEFAULTSQL

The revised patch quotes the variable $mysqldb, as suggested by Frère
Sébastien Marie.

This patch makes sure that pointing DEFAULTSQL in /etc/koha/koha-sites.conf
to any (gzip'ed) file produced by mysqldump works, by adding the name of the
database to the end of the call to mysql, when the specified SQL file is
loaded. Files produced with koha-dump-defaults should still work too.

To test:
- Apply the patch
- Create a new package with build-git-snapshot
- Install the package
- Create an SQL file from an existing installation with mysqldump
- gzip the SQL file
- point DEFAULTSQL to the file in /etc/koha/koha-sites.conf
- create a new site with koha-create --create-db

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b3b6278e206be11ce3b5a8e271f7bccb70539ac5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6863: Shelf Browser images not showing up
Ian Walls [Fri, 9 Sep 2011 18:37:22 +0000 (14:37 -0400)]
Bug 6863: Shelf Browser images not showing up

Fixes case for Syndetics (test condition was scoped wrong, leading to "no image available")
as well as Baker and Taylor (bad scope and capitalization on BakerTaylorImageURL).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b49534ebdc11c36844c87d9588fc4e420509b77e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6860: SyndeticsClientCode improperly scoped on many OPAC pages
Ian Walls [Fri, 9 Sep 2011 10:34:56 +0000 (06:34 -0400)]
Bug 6860: SyndeticsClientCode improperly scoped on many OPAC pages

SyndeticsClientCode was locally scoped in nearly all loops, preventing it from working.

This patch fixes not only search results and shelf browsers, but also rarely-used parts of
opac-detail, opac-opensearch, opac-readingrecord, opac-showreviews and opac-user

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 156a849aa3759f377af07d4cdc7a6f58e58c18f4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5602 - [3.4.x] Rewrite of package building script
Robin Sheat [Fri, 9 Sep 2011 03:50:07 +0000 (15:50 +1200)]
Bug 5602 - [3.4.x] Rewrite of package building script

Note: this is pulling in the most recent version from master. Working
with two different versions that have two different options was getting
painful, and it doesn't touch anything outside of debian/

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago6256 Follow up fixing typo
Marcel de Rooy [Wed, 7 Sep 2011 12:28:45 +0000 (14:28 +0200)]
6256 Follow up fixing typo

Fixing typo for 1062

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fb781f2dcd12fe2cb7562f24ea287e5111493480)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6750 Guarantor search broken on translated templates
Frédéric Demians [Thu, 1 Sep 2011 08:09:48 +0000 (10:09 +0200)]
Bug 6750 Guarantor search broken on translated templates

Fix the JavaScript to avoid implementing complex string substitution into JS
function call. This patch solves the bug and keep the ability to copy
borrower's address, name, etc., containing new line, simple quote, etc.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f64aaf063ea39b70c6f128d74d296566a021d217)

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