koha.git
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 years agoBug 6256: Many bib1 attributes missing
Ian Walls [Sun, 28 Aug 2011 01:19:55 +0000 (21:19 -0400)]
Bug 6256: Many bib1 attributes missing

This patch adds all the bib1 attributes listed in the bug report, in numerical order.  Names of attributes are
normalized; spaces are replaced by '-', '--' is reduced to '-' and parentheticals are dropped

In the particular case of att 1062, it is renamed from 'stocknumber' to 'Number-local-acquisition',
as per the bib1 definition.  The mapping in ccl.properties is retained as 'stocknumber', so all search
functions should continue to behave normally

Signed-off-by: <dev_patches@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5d8b1713da45ca82d67668a00bd345d9fcead717)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFollow up for 6665 : Fixing the hide_marc pref also
Chris Cormack [Mon, 5 Sep 2011 02:50:29 +0000 (14:50 +1200)]
Follow up for 6665 : Fixing the hide_marc pref also

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 34b553d03b96cb3c84ec978f6eea542f38f60de3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6665 : TT problem was preventing AdvancedMARCEditor pref from working when catalo...
Chris Cormack [Mon, 5 Sep 2011 02:42:55 +0000 (14:42 +1200)]
Bug 6665 : TT problem was preventing AdvancedMARCEditor pref from working when cataloguing

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 4363ff6669c92d0fbbd891fa870bd2cb5e021e9e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6555 : only 10 lists show in the staff client
Chris Cormack [Sun, 4 Sep 2011 23:27:40 +0000 (11:27 +1200)]
Bug 6555 : only 10 lists show in the staff client

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 e23608a1f90b7d25068870e82a19721fd70e60a5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6732 : Showing the bibliographic title on the manual invoices line
Chris Cormack [Mon, 5 Sep 2011 02:04:26 +0000 (14:04 +1200)]
Bug 6732 : Showing the bibliographic title on the manual invoices line

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUpdating about file and history doc
Chris Cormack [Tue, 6 Sep 2011 20:49:31 +0000 (08:49 +1200)]
Updating about file and history doc
(cherry picked from commit f09e8403119c08861ef1cec466447012b1b2775b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 6724: enable decimals on values greater than 1
Brett Wilkins [Mon, 29 Aug 2011 04:47:48 +0000 (16:47 +1200)]
bug 6724: enable decimals on values greater than 1

Separating perl standard uses from koha uses

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 f824121bb136b08ae3308168a0deeb524518fdde)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUpdating history and about file
Chris Cormack [Sun, 4 Sep 2011 08:49:09 +0000 (20:49 +1200)]
Updating history and about file
(cherry picked from commit 9e9326671426dbd41384a70d7e59c27632c890a3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 4877 [ENH] - [SIGNED-OFF] more man page improvements
Robin Sheat [Mon, 29 Aug 2011 00:24:45 +0000 (12:24 +1200)]
Bug 4877 [ENH] - [SIGNED-OFF] more man page improvements

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6534b5cf29ea044f405af976447fe67262780a0d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 4877 [ENH] - Update man page for koha-create
Magnus Enger [Sun, 28 Aug 2011 13:02:09 +0000 (15:02 +0200)]
Bug 4877 [ENH] - Update man page for koha-create

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
(to be followed by another patch that I think helps too)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6516 - Make borrowernumber of staff user configurable in koha-create
Magnus Enger [Tue, 9 Aug 2011 08:22:20 +0000 (10:22 +0200)]
Bug 6516 - Make borrowernumber of staff user configurable in koha-create

Sets the default borrowernumber of staff user to 1 and makes it possible
to override this with ADMINUSER in /etc/koha/koha-sites.conf or with the
--adminuser and -a command line options.

Remember to update the wiki if this gets pushed!

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6121: follow-up = using overloo instead of reserveloo
Paul Poulain [Wed, 10 Aug 2011 11:46:18 +0000 (13:46 +0200)]
Bug 6121: follow-up = using overloo instead of reserveloo

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f6d3cb05dde6f7e8e9f25a1c4c547e414bbf2d76)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6121: Holds awaiting pickup
Christophe Croullebois [Tue, 8 Feb 2011 16:58:54 +0000 (17:58 +0100)]
Bug 6121: Holds awaiting pickup

On holds over, when cancelling hold and returning to his branch a bug fill the branchtransfers.tobranch field with the branchname instead of the branch code.

BibLibre MT5647

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b2138a7ec64dead316286df4a822bf89d051f4cb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 5028 - Remove references to catmaintain.pl
Owen Leonard [Tue, 23 Aug 2011 18:57:02 +0000 (14:57 -0400)]
Fix for Bug 5028 - Remove references to catmaintain.pl

catmaintain.pl doesn't exist anymore. References to it in the
templates should be removed.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 6768, Two unused include files can be removed
Owen Leonard [Tue, 23 Aug 2011 18:52:37 +0000 (14:52 -0400)]
Fix for Bug 6768, Two unused include files can be removed

Removing error-top.inc and error-bottom.inc

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 4966 - follow up - add xhtml closure for input tags
Alex Arnaud [Fri, 2 Sep 2011 12:36:21 +0000 (14:36 +0200)]
Bug 4966 - follow up - add xhtml closure for input tags

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug4966 - follow up to 4966 changes language from 'end' to 'finish'
Nicole C. Engard [Fri, 5 Aug 2011 14:09:21 +0000 (10:09 -0400)]
bug4966 - follow up to 4966 changes language from 'end' to 'finish'

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 4966: Add a button in parcel.pl for confirm end receiving
Alex Arnaud [Fri, 5 Aug 2011 13:47:16 +0000 (15:47 +0200)]
bug 4966: Add a button in parcel.pl for confirm end receiving

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6595: [ENH] [SIGNED-OFF] Fixing German translation and address formatting (HOLD_P...
Katrin Fischer [Sun, 17 Jul 2011 15:18:47 +0000 (17:18 +0200)]
Bug 6595: [ENH] [SIGNED-OFF] Fixing German translation and address formatting (HOLD_PRINT)

Patch fixes some translation issues and address formatting for printed
hold notices.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6ba4419be0826f9535e92d1bbf3612f7bf0695b7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6595:[ENH] [SIGNED-OFF] Add German translation of purchase suggestion mails
Katrin Fischer [Sun, 17 Jul 2011 14:20:00 +0000 (16:20 +0200)]
Bug 6595:[ENH] [SIGNED-OFF] Add German translation of purchase suggestion mails

Translates the purchase suggestion mails in sample_notices.sql from English to German.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ba78d6a8503d9340797eeabf2f9655efaee6f993)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 6834 followup removing param_map
Henri-Damien LAURENT [Fri, 2 Sep 2011 08:36:29 +0000 (10:36 +0200)]
bug 6834 followup removing param_map

param_map was still to be found in two files.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6834 : Removing last of the $template->{param_map}
Chris Cormack [Fri, 2 Sep 2011 03:31:28 +0000 (15:31 +1200)]
Bug 6834 : Removing last of the $template->{param_map}

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6479 Converts all the serialseq variables to UTF-8.
Frédérick Capovilla [Tue, 7 Jun 2011 18:03:08 +0000 (14:03 -0400)]
Bug 6479 Converts all the serialseq variables to UTF-8.

Corrects a problem when an UTF-8 character is used in the serial
numbering formula. The encoding became incorrect when concatenating the
number in the subscriptionhistory table.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To reproduce:
- Create subscription with numbering pattern N° {X}
- Receive 2 or more issues
- Check subscription summary page and manual history fields on the edit screen

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit acc684bc01fca37615009a778ba5927e40f52d29)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 2539 - kohaspsuggest is deprecated, notes outmoded
Owen Leonard [Mon, 22 Aug 2011 20:09:05 +0000 (16:09 -0400)]
Fix for Bug 2539 - kohaspsuggest is deprecated, notes outmoded

Removing unused script.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6275 - allow automated backups for packages
Robin Sheat [Thu, 28 Apr 2011 03:21:04 +0000 (15:21 +1200)]
Bug 6275 - allow automated backups for packages

This causes backups for the last two days to be stored by default. The
backups will go into /var/spool/koha.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6656 : Fix for advanced search not respecting default sort order
Chris Cormack [Mon, 29 Aug 2011 03:35:45 +0000 (15:35 +1200)]
Bug 6656 : Fix for advanced search not respecting default sort order

Rebase for 3.4.x

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6822: fix RIS export from OPAC
Steven Callender [Tue, 30 Aug 2011 19:19:23 +0000 (15:19 -0400)]
Bug 6822: fix RIS export from OPAC

Prior to this patch, RIS export was producing
effectively empty output.

Signed-off-by: Steven Callender <stevecallender@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a2a9bc522035c17a24aa48badc5184b015197826)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6351: Cannot delete library-specific holds polices and checkout limits
Ian Walls [Tue, 30 Aug 2011 17:49:51 +0000 (13:49 -0400)]
Bug 6351: Cannot delete library-specific holds polices and checkout limits

Template::Toolkit scope error on delete links on Checkout Limit by Patron Category
and Holds Policy by Item Type areas.

Testing Results:
Tested adding and removing Checkout Limits by Patron Category - both work
Tested adding and removing Holds Policies by ItemTypes - both work

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6704 : Escaping html in the merging records, so " don't break the merge
Chris Cormack [Mon, 29 Aug 2011 04:46:11 +0000 (16:46 +1200)]
Bug 6704 : Escaping html in the merging records, so " don't break the merge

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
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 720e3012a87ca437c17e864f159138304ed0c006)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6794 : Fixing a bug with member flags in IE
Maxime Pelletier [Fri, 26 Aug 2011 21:09:46 +0000 (09:09 +1200)]
Bug 6794 : Fixing a bug with member flags in IE

Rebased for template toolkit

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
(cherry picked from commit 6756581cf88bcbe40203722bb29aef6abe9283f6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5524 : Cant delete list from the second page of lists
Chris Cormack [Fri, 26 Aug 2011 01:42:44 +0000 (13:42 +1200)]
Bug 5524 : Cant delete list from the second page of lists

Includes follow up fixing deleting lists in OPAC

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 e39de040206eae26e22d6375479b548017cb7217)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6528 : Cataloguing search not showing location for available items
Chris Cormack [Mon, 29 Aug 2011 02:14:58 +0000 (14:14 +1200)]
Bug 6528 : Cataloguing search not showing location for available items

Cataloging search now shows holdings information.

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 ff4b179e14ab15bf5d20852a37e2b0a2dca45800)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6715 - Fix xmlControlfield.js so the xml files are fetched in the correct languag...
preprod34 [Fri, 12 Aug 2011 15:44:33 +0000 (11:44 -0400)]
Bug 6715 - Fix xmlControlfield.js so the xml files are fetched in the correct language directory.

xmlControlfield.js was always fetching the "en" xml file, preventing the translations
from working.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Apply patch
- Install language files, example: perl translate install de-DE
- Edit .xml files for value builders 006 and 008
- Test by creating a new record and using value builders

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUpdating about page and history
Chris Cormack [Sun, 28 Aug 2011 07:47:22 +0000 (19:47 +1200)]
Updating about page and history
(cherry picked from commit 61758c8bcbd6d8c2a03e39ca196e944470520c97)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 6712 - Remove memberofinstitution markup from templates until it can...
Owen Leonard [Thu, 11 Aug 2011 19:21:35 +0000 (15:21 -0400)]
Fix for Bug 6712 - Remove memberofinstitution markup from templates until it can be completed

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Make sure syspref memberofinstitution is turned on
2) Add a new patron of organisation category (example: library)
3) Check that there is no field set 'organisation' showing up
4) Checkout books to any borrower
5) Renew books until no longer possible
6) Scan barcode from renewed book to force renewal
6) Check that the 'no more renewals' message has no empty pull below text message

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 6696, New category button broken when no categories defined
Owen Leonard [Wed, 10 Aug 2011 15:44:37 +0000 (11:44 -0400)]
Fix for Bug 6696, New category button broken when no categories defined

The javascript tablesorter will trigger an error if we try
to apply it to a table with no <tbody>. That error prevented
the YUI button script to complete properly, hence the broken
button.

This patch hides the table in cases where there are no
categories and displays an error message instead.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Deleted all patron categories and checked button was broken
- Applied patch and checked again - button shows up
- Nice: There is a note now that you have to create categories

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 6652, Zip showing in funny place on libraries admin
Owen Leonard [Mon, 1 Aug 2011 11:51:18 +0000 (07:51 -0400)]
Fix for Bug 6652, Zip showing in funny place on libraries admin

This fixes display of Zip code relative to the city and state if
you're in the USA and you like to do it this way. At the very
least this matches how we display addresses elsewhere in Koha.

It should be noted that this makes it incorrect for anyone who
wants to see addresses like this:

[name]
[street address]
[postal code + city]

...or any other variation of course.

While I'm in there, also making branch URLs and emails clickable.

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 3731ec80fc407ba4668450b48c9c81b8c0a98460)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 6791 - editing list with apostrophe loses text
Owen Leonard [Fri, 26 Aug 2011 19:14:48 +0000 (15:14 -0400)]
Fix for Bug 6791 - editing list with apostrophe loses text

Markup used single quotes around value attribute. Since single
quotes aren't escaped by the template's HTML filter these
quotes conflicted with the one in the text.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6733 - Change return page after printing routing slip
Colin Campbell [Fri, 26 Aug 2011 16:14:25 +0000 (17:14 +0100)]
Bug 6733 - Change return page after printing routing slip

Previously printing a routing slip returned the user to
the top level in serials this change maintains the context
in the current subscription

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6765: sip2 unicode checksum
Ulrich Kleiber [Fri, 29 Jul 2011 14:35:40 +0000 (16:35 +0200)]
Bug 6765: sip2 unicode checksum

Changes checksum calculation method, as per Dan Scott's fix in openncip.
see http://sourceforge.net/tracker/?func=detail&aid=2925760&group_id=161781&atid=821216

http://bugs.koha-community.org/show_bug.cgi?id=6765
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8a7c9167660493bc1a01a93dddba37a1a3683bc0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 4419 - cannot change module for notice templates
Owen Leonard [Mon, 22 Aug 2011 15:08:59 +0000 (11:08 -0400)]
Fix for Bug 4419 - cannot change module for notice templates

Adding a hidden form field to contain the original module
so that it can be used in the check for an existing entry.

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 eb7456c685db962f0c1c3d1d88421711a7ec4a7d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6662: Remove Dewey Specific References in Sort
Nicole C. Engard [Sat, 20 Aug 2011 23:33:18 +0000 (19:33 -0400)]
Bug 6662: Remove Dewey Specific References in Sort

The sort option used to include tooltips for call number
that were Dewey specific.   This patch removes references
to Fiction and Nonfiction so that it can apply to any
classification.

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 57a0fcb475ff7e353329ba9a7e5963a22351b4c9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago6747 Checks in opac-export
Marcel de Rooy [Mon, 22 Aug 2011 12:02:03 +0000 (14:02 +0200)]
6747 Checks in opac-export

Added check on returned marc. If record does not exist, generate 404. (Prevents 500 errors by Googlebot on deleted records.)
Fixed typo, whitespace. Removed if on op=export. Added check on format.

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 223156ea74233122c35d16100724eddbcd69d66a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUpdating Version Number to 3.04.04.001
Chris Nighswonger [Fri, 2 Sep 2011 19:07:38 +0000 (15:07 -0400)]
Updating Version Number to 3.04.04.001

12 years agoBug 5866 : Updated patch to speed up holds awaiting pickup
Chris Cormack [Thu, 25 Aug 2011 03:21:01 +0000 (15:21 +1200)]
Bug 5866 : Updated patch to speed up holds awaiting pickup

This reduced execution time on the report from timeout (1400 holds waiting + 200 holds over) to 6 or so seconds, with 1566 holds over (test data, no holds waiting).

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFollow-up fix for Bug 6753, Markup corrections and improvements for label export...
Owen Leonard [Fri, 19 Aug 2011 14:23:58 +0000 (10:23 -0400)]
Follow-up fix for Bug 6753, Markup corrections and improvements for label export window

Making the same changes to the patron card export window.
Now that all references are removed, the old icons and CSS
have been removed as well.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
(cherry picked from commit 63d300191efb3207b7ebb95b98db0d86ca371f16)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFollow-up fix for Bug 6726 - When SMS is enabled the messaging table is misaligned
Owen Leonard [Wed, 24 Aug 2011 13:50:19 +0000 (09:50 -0400)]
Follow-up fix for Bug 6726 - When SMS is enabled the messaging table is misaligned

Corresponding fix for the OPAC

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 666a2316d8adbd8fadba263c42dba71fe992532c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFixing typo in history doc
Chris Cormack [Fri, 26 Aug 2011 01:00:54 +0000 (13:00 +1200)]
Fixing typo in history doc
(cherry picked from commit 9c346e25269ada0b3fa5f5a6934986970c6b9a9f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago150th developer!!!
Chris Cormack [Fri, 26 Aug 2011 00:49:50 +0000 (12:49 +1200)]
150th developer!!!

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6723 : import-framework-crlf
Ward van Wanrooij [Mon, 15 Aug 2011 12:38:40 +0000 (14:38 +0200)]
Bug 6723 : import-framework-crlf

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6562: Silence runtime error in reserve/request.pl
Colin Campbell [Mon, 4 Jul 2011 15:20:59 +0000 (16:20 +0100)]
Bug 6562: Silence runtime error in reserve/request.pl

Not defining action just causes logging of noisy
runtime warnings.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 6538 update letter.pl help file
Nicole C. Engard [Tue, 28 Jun 2011 19:24:45 +0000 (15:24 -0400)]
bug 6538 update letter.pl help file

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 6695 - Layout of patron category add/edit form slightly broken
Owen Leonard [Wed, 10 Aug 2011 15:16:42 +0000 (11:16 -0400)]
Fix for Bug 6695 - Layout of patron category add/edit form slightly broken

The markup for the fields for enrollment period "in months" and "until date"
was non-standard I think because the two fields are supposed to be visually
and functionally linked (having the same purpose and being mutually
exclusive).

This patch changes the markup so that the two fields share a fieldset
having "choose one" as the legend. The "hint" is now hidden unless
it is triggered by the javascript validation on submit.

I wanted to trigger the validation of the two fields onblur instead
of just onsubmit, but found that the datepicker widget doesn't
consistently trigger a change or a blur event on that field.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Layout problems are fixed
- Layout is more clear about choosing either 'In months' or 'Until date'
- Clear error message shows when you enter values in both fields

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFollow-up to Bug 4868, Improve controls for cloning and deleting subfields
Owen Leonard [Mon, 15 Aug 2011 19:22:21 +0000 (15:22 -0400)]
Follow-up to Bug 4868, Improve controls for cloning and deleting subfields

- Adding similar icons for cloning and deleting tags
- Adding icon for the "Tag editor" links ("...")

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
(cherry picked from commit 7b2cd8e636a5b2eda0c405c2198eb09c2c35e22c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6727 - Change on exporting and importing csv to deal with spurious CR/LF
Salvador Zaragoza Rubio [Fri, 19 Aug 2011 10:33:05 +0000 (12:33 +0200)]
Bug 6727 - Change on exporting and importing csv to deal with spurious CR/LF

Function _export_table_csv modified to remove CR/LF in the data
from the database to built a correct csv file.

Function _import_table_csv modified to deal with CR/LF in the data
field. When a line is found with an unproper end (a data field has not
end quote), it's concatenated to a temporary buffer until the next
line ends ok and then it's proccessed.

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 6b69260fbd75f80b1831341b9bb5b18b54fef56b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFollow-up fix for Bug 5498, Standardize markup and style of pagination menus
Owen Leonard [Fri, 19 Aug 2011 18:40:48 +0000 (14:40 -0400)]
Follow-up fix for Bug 5498, Standardize markup and style of pagination menus

Missed a couple of instances of the pagination menu on the
lists page. Previously the pagination links on the page
listing lists (/cgi-bin/koha/virtualshelves/shelves.pl) was
unstyled. After this patch the links should be styled.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 6602 - Reports dictionary doesn't properly recognize text columns
Owen Leonard [Mon, 18 Jul 2011 19:38:13 +0000 (15:38 -0400)]
Fix for Bug 6602 - Reports dictionary doesn't properly recognize text columns

Reports dictionary won't let you set a comparison for MEDIUMTEXT columns. To
test, choose a MEDIUMTEXT column like borrowers.surname in Step 3 of adding
a new dictionary definition. Before the patch, in Step 4 you would not see
any kind of form field for entering a comparison. After patching Step 4 will
offer you a field labeled "Search string matches."

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes described problem with mediumtext columns.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6540 - Followup - koha-create would die without --configfile
Magnus Enger [Mon, 15 Aug 2011 07:00:07 +0000 (09:00 +0200)]
Bug 6540 - Followup - koha-create would die without --configfile

koha-create would fail to check that --configfile was set on the
commandline, before either including it if it existed or dying if
it did not. This patch should make sure the existence of a
configfile is only tested if --config is set.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
This should apply against 3.4 and master.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 31bb901e2b31748dd86e7da45672c42a5359c5a4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 6726 - When SMS is enabled the messaging table is misaligned
Owen Leonard [Tue, 16 Aug 2011 12:38:21 +0000 (08:38 -0400)]
Fix for Bug 6726 - When SMS is enabled the messaging table is misaligned

The SMS section of the template was commented out in the patch
pushed for Bug 5889, 'Allow message names to be translatable'
with the comment 'fixing columns overflow.' That seems to have been
a cosmetic fix for what I can only imagine was a different bug?

Also fixing a T:T variable scope error.

After applying this patch the "SMS" column in the Patron messaging
preferences should appear when the SMSSendDriver preference is not empty.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 6728, Table sorter for receiving acquisitions
Owen Leonard [Wed, 17 Aug 2011 20:04:55 +0000 (16:04 -0400)]
Fix for Bug 6728, Table sorter for receiving acquisitions

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6703 : Link to invoice broken
Chris Cormack [Mon, 22 Aug 2011 02:05:05 +0000 (14:05 +1200)]
Bug 6703 : Link to invoice broken
(cherry picked from commit b78004c8e1e4c01ec44feede84bca58a9921664c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 6753, Markup corrections and improvements for label export window
Owen Leonard [Thu, 18 Aug 2011 20:25:32 +0000 (16:25 -0400)]
Fix for Bug 6753, Markup corrections and improvements for label export window

The most visible change in this patch is the conversion of image-only
links to text links combined with icons. Other changes include
markup corrections and standardization and language corrections.

To test, go to Labels > Manage Batches. Select a batch and click
'Export' to see the revised interface.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 77e1a62efa6814b1beaefd5f8dd99b31643182bc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 6754, Improve breadcrumbs on lists pages
Owen Leonard [Fri, 19 Aug 2011 18:38:37 +0000 (14:38 -0400)]
Fix for Bug 6754, Improve breadcrumbs on lists pages

Breadcrumb navigation on the lists pages should give the user links back to the
category of list they're viewing, public or private.

Patch changes this:

Lists -> Contents of (Your list)

To this:

Lists -> Your lists -> Contents of (Your list)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 6640, Locations not showing in circ reports
Owen Leonard [Tue, 2 Aug 2011 19:23:00 +0000 (15:23 -0400)]
Fix for Bug 6640, Locations not showing in circ reports

An invalid template syntax for defining a variable's default
value is found in the circ report template and several
others:

[% DEFAULT LibraryNameTitle="Koha Online" %]

Based on the T:T docs this appears to be the correct way of defining
a default value:

[% LibraryNameTitle or "Koha Online" %]

Reference:

http://template-toolkit.org/docs/manual/Syntax.html#section_Implicit_Directives_GET_and_SET

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6744 - Acknowledge the actual es-ES translators
Tomas Cohen Arazi [Wed, 17 Aug 2011 16:45:34 +0000 (13:45 -0300)]
Bug 6744 - Acknowledge the actual es-ES translators

es-ES translator credits are way outdated as of http://translate.koha-community.org/es/34

Regards
To+

Signed-off-by: Federico Rinaudo <frinaudo@infocpt.com.ar>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bc5aa5281d4bc29c8398d3411db4b03e1601ad4f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUpdating Version Number to 3.04.04.000 v3.04.04
Chris Nighswonger [Tue, 23 Aug 2011 01:20:15 +0000 (21:20 -0400)]
Updating Version Number to 3.04.04.000

12 years agoRelease Notes for 3.04.04.000
Chris Nighswonger [Tue, 23 Aug 2011 01:18:19 +0000 (21:18 -0400)]
Release Notes for 3.04.04.000

12 years ago3.4.4 Translation Update
Frédéric Demians [Mon, 22 Aug 2011 17:23:54 +0000 (19:23 +0200)]
3.4.4 Translation Update
(cherry picked from commit 56784292393608d1303dd2d08151ef37af1a67f4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6269 - can't undefine a printer profile
Chris Nighswonger [Wed, 17 Aug 2011 15:23:17 +0000 (11:23 -0400)]
Bug 6269 - can't undefine a printer profile

This patch adds a 'No Profile/N/A' selection to the printer profile
drop-down menu along with code to handle the selection of it. This
selection is the default selection for new templates.

Documentation should be updated to reflect this change.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6678 - Fix some problems with the standard NORMARC framework
Magnus Enger [Sun, 7 Aug 2011 21:38:02 +0000 (23:38 +0200)]
Bug 6678 - Fix some problems with the standard NORMARC framework

- Almost all fields are displayed as expanded in the cataloguing screens,
  because hidden=0 when it should be -1
- Koha-specific fields need to be translated
- some unnecessary punctuation should be removed
- problem with encoding - æøå not displayed correctly

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- created a new database  with all nb-NO sample files, no errors reported
- checked the cataloging frameworks for displaying problems
- saved record and created an item - all koha specific fields translated
No problems found.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 142e75c94ade26000671d19bd7d729cec681ff8e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6486 - make koha-mysql get installed with the packages
Robin Sheat [Thu, 9 Jun 2011 05:15:09 +0000 (17:15 +1200)]
Bug 6486 - make koha-mysql get installed with the packages

A useful addition I overlooked.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6486 - add the koha-mysql command
Robin Sheat [Thu, 9 Jun 2011 05:00:45 +0000 (17:00 +1200)]
Bug 6486 - add the koha-mysql command

This lets you get into the mysql session for this library instance
really easily. Probably most useful for developers.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6458 Template Toolkit files test case
Frédéric Demians [Thu, 21 Jul 2011 08:18:29 +0000 (10:18 +0200)]
Bug 6458 Template Toolkit files test case

This test validate Template Toolkit (TT) Koha files.

For the time being an unique validation is done: Test if TT files
contain TT directive within HTML tag. For example:

  <li[% IF

This kind of constuction MUST be avoided because it break Koha
translation process.

This patch transform also translation specific modules into C4 modules
in order to be able to use them in test case:

  C4::TTPaser
  C4::TmplToken
  C4::TmplTokenType

This patch is a Perl adaptation of a Haskell script from Frère Sébastien
Marie.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Notes on testing:
- translate install de-DE - worked ok
- translate update de-DE > translate install de-DE - worked ok
- running the test xt/tt_valid.t - worked ok and pointed out lots of problems.
Found no problems.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6482 - allow the mysql details to be changed during koha-create
Robin Sheat [Wed, 8 Jun 2011 03:10:09 +0000 (15:10 +1200)]
Bug 6482 - allow the mysql details to be changed during koha-create

This allows the database details (username and database name in
particular) to be modified in between a koha-create --request-db and
--populate-db. Most useful when you discover that the username is too
long or something. Now, when populating the database, the connection
information is reloaded from the koha-conf.xml rather than being
generated from the instance name.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6714 : Removed the "en" in some paths of opac.css
preprod34 [Fri, 12 Aug 2011 13:44:51 +0000 (09:44 -0400)]
Bug 6714 : Removed the "en" in some paths of opac.css

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 6743 - displayFacetCount not working
Owen Leonard [Wed, 17 Aug 2011 19:40:39 +0000 (15:40 -0400)]
Fix for Bug 6743 - displayFacetCount not working

T:T variable scope error.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit db44c217b22e88dd4ee88cc9c15ddcf928fe3d4e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUpdating Version Number to 3.04.03.002
Chris Nighswonger [Wed, 17 Aug 2011 02:25:05 +0000 (22:25 -0400)]
Updating Version Number to 3.04.03.002

12 years agobug_4002: issues referential integrity
Paul Poulain [Wed, 3 Aug 2011 09:29:01 +0000 (11:29 +0200)]
bug_4002: issues referential integrity

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d0c9592592c0bd6c529915a9fbc04476f9b52851)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5098: Add csv headers in overdues
Julian Maurice [Mon, 4 Apr 2011 14:52:03 +0000 (16:52 +0200)]
Bug 5098: Add csv headers in overdues

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a3e55473555ee4b3a3dd4af81f1b163519278775)

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