Commit Graph

14397 Commits

Author SHA1 Message Date
Ian Walls f1894dada9 Bugs 6634: manager_id not recorded for payments and rental charges
Manager_id, the borrowernumber of the staff person doing the action, was not recorded
for payments, rental charges, or rental charges on renewals.  This patch implements that.

This patch also adds the recording of itemnumber in a payment, by taking the itemnumber of
the account that it's paying off.  This addresses bug 2696, though it does not make any
change to the display logic of the Payments line in the staff client.

To test:
1.  Check out an item with an issuing charge
2.  Renew the item
3.  Pay one of the rental charges on the item
4.  Verify in koha.accountlines that each of the three above operations recorded your borrowernumber
in accountlines.manager_id

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 18c491542b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-15 09:05:37 -04:00
Frédérick Capovilla d3adb09b80 Bug 6690: If multiple issues are received in serials-edit.pl, changing the status of any issue changes the date of the first issue.
If multiple issues are in the list, changing the status of any issue in
the table would always change the "Expected on" date of the first issue.
Modified the javascript so the date is modified on the correct row.

Reimplementation of Patch for 3.4.x
Patch for 3.2.x from Frédérick Capovilla

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-15 08:58:04 -04:00
Sophie Meynieux bba89e3279 Bug #6139 Automatic incrementation of call number does not work if prefix contains '
This patch also fixes giving the first callnumber with a given prefix.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-14 13:46:24 -04:00
Colin Campbell 1f3ae4aa42 Bug 6181: Remove CGI Scolling lists from C4::Budgets
As noted on bug 766 more cases of usage of
CGI::scrolling_list were imported into C4::Budgets
Even if we were not trying to remove usage of this
the C4 modules are not the place to generate markup
Most of these routines are noise as they are not used in
any current code but cause confusion and increase
maintenance overhead. They are removed

The sort dropboxes on order create are the only
references in current templates to these routines
they have been replaced by a select list generated
by the markup.
They can probably be removed too but their existence
although the option that causes them to be displayed
seems unlikely to be set. I've left them pending
resolution of some of the inconsistencies and
confusions surrounding Budgts

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-14 13:46:10 -04:00
Owen Leonard 5d474bdf5f Fix for Bug 6309, subscription table sorter in the opac
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit b7985fb04f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-14 13:45:00 -04:00
Ian Walls 68b6c81f91 Bug 2629: add char-with-stroke support to word-phrase-utf.chr
This patch adds diacritic search support for the following characters-with-stroke:
a,b,c,d,e,h,l,r,t,u,y,z

Handles both uppercase and lowercase mappings.

Also corrects a note in word-phrase-utf.chr:  the 'equivalent' command is NOT for searching,
but rather for sorting.  See Zebra manual: http://www.indexdata.com/zebra/doc/character-map-files.html,
near the bottom.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

Some notes:
- Copied the file to my koha-dev folder and reindexed
- Tried some simple searches like: Süden and Suden, schon und schön with success
- Added some of the new characters to a record and tried search with and
  without diacritics (ɨƗʉⱥɆɌ and iiuaer) with success.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-14 13:44:42 -04:00
Ian Walls 991d9ff01f Bug 6476: Baker & Taylor Content Cafe link not showing
Another T:T issue.  Patch replaces 'BakerTaylorContenturl' with 'BakerTaylorContentURL'
universally in all occurences in the templates (only opac-detail.tt)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-14 13:43:52 -04:00
Katrin Fischer 5971c9b0fb Bug 6692: Small template change: Set > Set library
Changes the link to change the library from 'Set' to 'Set library'
in the grey toolbar in staff.
(cherry picked from commit 3e0d7bc7e5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-14 13:43:40 -04:00
Nicole C. Engard 6a12d4c078 bug 6702 update typo in BiblioAddsAuthorities preference
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a66ae182f8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-14 13:43:13 -04:00
Robin Sheat 1db8cd79ac Bug 6626 - add sudo as a package dependency
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 66c3b1507a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-14 13:42:59 -04:00
Frédéric Demians 086b459656 Bug 6150 UNIMARC field 225 plugin: allow $a value data entry
The current UNIMARC 225 plugin behavior forces cataloguer to select a
collection name in a combo box. The content of this combo box comes from
special EDITORS authorities list which is constructed by a script. So
there is no way to add a new collection directly in biblio data entry
form.

A input box can be added to the plugin form in order to enter by hand a
new collection.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-14 13:42:46 -04:00
Chris Cormack 02d879bd7f Bug 6713, editing matching rules broken
Was a template error, but also a bug that had been in there for a
while fixed too

Please test by editing a matching rule, match sure no new match checks
are added, and that the matchpoint components survive.

Then try importing some marc records using that match rule

Signed-off-by: Nicole 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 9b38eccf73)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-14 13:42:11 -04:00
Marcel de Rooy c0f5c4e4c7 5663: Show control number without organization code in staff URLs
Intranet detail xsl adjusted at 4 places: 773 when leader19=c, 775, 780, 785.

Enable the pref UseControlNumber when testing this patch. And set pref XSLTDetailsDisplay to using XSLT stylesheets.
Test by adding a control number ($w) in abovementioned fields.
Go to staff detail and check if the links work.
Add some orgcode between parentheses or brackets in front of the control number.
Test again in staff detail if the links still work.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-14 13:41:57 -04:00
Chris Cormack 45c24797a1 Bug 6553 : Follow up adding license statements
http://bugs.koha-community.org/show_bug.cgi?id=6653

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Patch only adds license text.
(cherry picked from commit 70d86d4fe0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-14 13:41:07 -04:00
Chris Cormack e4fce0023f Bug 6553 : Fixing authentication issue, there is no reason we should be able to use these without authentication
http://bugs.koha-community.org/show_bug.cgi?id=6653

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit aa51c89d57)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-14 13:40:37 -04:00
Chris Nighswonger 274a80276f Updating Version Number to 3.04.03.001 2011-08-12 07:23:19 -04:00
Nicole C. Engard 06030b1090 bug 6701 - change timeout to say milliseconds
Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit be38a33f5b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-12 07:11:09 -04:00
Janusz Kaczmarek e6838a6a1b Bug 6468 - Authorities browsing error in OPAC
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit da7bcbd4e6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-12 07:10:57 -04:00
Janusz Kaczmarek c8c884214f Bug 6461 - BiblioDefaultView has no impact on how record are displayed when going from results list
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9dafa2aada)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-12 07:10:45 -04:00
Srdjan Jankovic 6c469876d9 bug_6410: correct borrowernumber template var name
Conflicts:

	koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-12 07:10:33 -04:00
Frédérick Capovilla ab663efad4 Bug 6373 : Corrects a validation problem on addbiblio.pl on IE8
The mandatory fields popup didn't appear when some mandatory fields
weren't filled on IE8. Replacing the "focus" with its JQuery equivalent
corrected the problem.

[EDIT by Owen Leonard] Removed commented line

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

Follow-up by owen, that he forgot to upload on bugzilla:

Signed-off patch includes one minor edit: I removed the commented-out line

which the jQuery line replaces. We have git to track changes for us, we don't
have to leave old code in.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-12 07:10:19 -04:00
Frédérick Capovilla f6bad1846c Bug 6369 Correct a formatting problem in the pdf generation of basketgroup.pl
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 552cde08db)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-12 07:10:05 -04:00
Owen Leonard 22ce098d89 Fix for Bug 6346 - Patron search results should be valigned top
I'm going for the nuclear option: Let's valign-top all table cells.
Having vertical-align : middle really only works well if your
table cells have the same height.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-12 07:09:55 -04:00
Marcel de Rooy 1b6b2a6d91 Bug 4959 (Language inconsistencies on basket groups; skip confirmation when closing basket)
This patch adds a new pref BasketConfirmations. This adds the option to skip
confirmations on closing and reopening a basket. If you skip the confirmation,
you do not create a new basket group.
The confusing line Create a purchase order (when closing a basket) is replaced
by Attach basket to a new basket group with the same name.
A warning for a null value on basketgroupid is fixed.

Rebased April 11.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f53dcce0ad)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-12 07:09:11 -04:00
Chris Cormack 6eb2933030 Updating history
(cherry picked from commit 4b0c474eb9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-11 16:32:40 -04:00
Marcel de Rooy e8a1641c2f 4959: Language inconsistencies on basket groups; skip confirmation when closing basket.
Follow up patch for installing pref BasketConfirmations.

Rebased for 3.4.X August 4, 2011.

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-11 16:31:57 -04:00
Owen Leonard d27818d806 Fix for Bug 6686, Can't delete messages
T:T variable scope error which only affected systems
with the AllowAllMessageDeletion preference ON

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 21:52:44 -04:00
Owen Leonard feb27c08aa Fix for Bug 6291, Cart printing truncated in Firefox
Implementing 100% width and height on <table>,<td>, and <th>
as suggested by this post:

http://www.piglets.org/serendipity/archives/45-Fixing-truncated-printing-with-Firefox.html

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 21:51:21 -04:00
Marcel de Rooy 7aeccb7ec2 6290: Fix warning on XSLT.pm
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 04e97b57ff)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 21:51:03 -04:00
Colin Campbell 06a38274ca Bug 6280 : Don't generate invalid SQL in GetPendingIssues
Change to parameter list in GetPendingIssues made it
callable by an empty list resulting in invalid sql being
sent to server. As this was occuring on most issues error log
was filling up. Put safeguard in the routine
Also don't bother calling when you have no need

Some of the processing was needlessly obscure

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c435c8c7d1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 21:50:45 -04:00
Owen Leonard a94bf07f5e Fix for Bug 6260 - Missing space in availability information of OPAC XSLT results
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6a1b7a3321)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 21:50:04 -04:00
Frédérick Capovilla 4058142f3e Bug 6235 : Corrects the behaviour of the humanmsg box on IE8 and IE7.
Without this fix, the black box that appears when you save system
preferences doesn't disappear on IE.

Fix from http://code.google.com/p/humanmsg/issues/detail?id=1
(Thanks Owen Leonard)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 661bcfadbd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 21:49:40 -04:00
Juan Romay Sieira 7cb450bef9 Bug 6144 - Cant hide constraints when showed at subfield edition
Reformatted for Template::Toolkit

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 21:49:07 -04:00
Sophie Meynieux 9e03bb0edc Bug 6078: Request to find borrowers without issues overload the server
Optimization of the SQL request using NOT EXISTS instead of NOT IN

BibLibre MT5946

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 17:48:49 -04:00
Jane Wagner 36523ea36a Bug 6034 - Shelving cart feature can wipe permanent shelving location in certain circumstances
Bugfix for problems when shelving cart used without In Processing settings

To test, with InProcessingToShelvingCart off, NewItemsDefaultLocation blank,
and ReturnToShelvingCart on, create a new item.  Check the contents of the
location and permanent_location fields in its item record -- the same value
should be in both.  Then run the item through checkin, and look at those fields
again.  The location field should now be set to CART while permanent_location
should still have the original value.  After the cart_to_shelf cron job runs
with the proper timing, check the item record again.  Both location and
permanent_location should again be identical.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2bb9904ab3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 17:48:28 -04:00
Owen Leonard ff12161982 Fix for Bug 6534 - Duplicate opac renew buttons at the top of the checkouts list
This patch uses JS to add two links to the top of the checkouts
table: renew selected and renew all. Clicking each one submits
the respective form.

Also added is a small validation routine to warn the user if
they try to "renew selected" without having checked any boxes.

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>
(cherry picked from commit 7093f075a7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 17:43:31 -04:00
Marcel de Rooy 608e17fb96 5660 Webinstaller should check if KohaOpacLanguage exists in staff
Rebased on April 27 for master (3.05.00.001).

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

Signing off on the whitespace changes made by Paul

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 17:43:01 -04:00
Liz Rea 627d5683a7 Bug 6527 - Table striping not working on cataloguing search
Resolves TT issue causing the results list in cataloguing search (addbooks.pl) to not be
striped.

To test:
More -> Cataloging
do a search

Without patch:
results will not alternate striping as originally intended.

With patch:
Results will be alternating white/grey.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 17:42:46 -04:00
Jean-André Santoni 8a6278251e Bug 5639 (MT #3605) Fix escaping in ILSDI
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2c88e1e0f8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-10 17:37:48 -04:00
Robin Sheat cb0862db67 Bug 5072 - prevent creating new orders if there are no valid budgets
On the basket editing screen, the links to add orders to a basket are
hidden unless a valid fund is available.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-03 22:44:06 -04:00
Chris Cormack 1410123f6d Bug 5072 : Template changes
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5b05ab8bf1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-03 22:43:49 -04:00
MJ Ray 270384df32 Bug 5468: removin apt-get-debian-lenny and updating INSTALL.debian
install_misc/apt-get-debian-lenny.sh: obsolete, causing problems and a questionable practice, so deleted INSTALL.debian: updated to use debian.packages instead and cite more related docs

Amended following feedback comment #6 from Robin Sheat <robin@catalyst.net.nz>

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-03 22:43:25 -04:00
Frère Sébastien Marie 16eb069c92 Bug 5131 :restrict use of sort_by value to allowed values
The user input for sort_by value was used without care, resulting the possibility for user to set any Template Variable to 1.

This patch restrict the values to sort field.
The list of allowd_sortby was taken from 'includes/resort_form.inc'.

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 649573ad24)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-03 22:42:59 -04:00
Srdjan Jankovic 087c658d19 bug_4415: Copy parent contact details to child when adding Let child details be managed separately
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 33a9aec802)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-03 18:30:11 -04:00
Frédérick Capovilla 18160fa5e2 Bug 5737: Modified the merge subroutine in AuthoritiesMarc.pm so it won't destroy the connection to the biblioserver.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit 94700d65c0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-03 18:29:55 -04:00
Owen Leonard 90df8fef9a Fix for Bug 6635, Can't page through results in label batch
- Fixing T:T scope issue
- Correcting footer include for pop-up windows.
- Markup correction for validity.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-03 18:29:30 -04:00
Robin Sheat 54abc8e5f3 Bug 6540 - [SIGNED-OFF] fix some command-line args issues
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e7cf2223e0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 16:22:02 -04:00
Magnus Enger e871a3faf3 Bug 6540 - Add config file as command line option for koha-create
Order of precedence for config options, from lowest to highest:

1. The defaults set in koha-create itself
2. /etc/koha/koha-sites.conf
3. Config file specified with --configfile
4. Individual options set with --marcflavor, --zebralang, --defaultsql

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 16:22:02 -04:00
Magnus Enger 7d99f048a4 Bug 6540 - Add defaultsql command line option
This will override the setting in /etc/koha/koha-sites.conf.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 16:22:01 -04:00
Magnus Enger 565ed0c6a4 Bug 6540 - Followup patch adding command line options
This adds the --marcflavor and --zebralang commandline options, as
well as short versions of all options.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-08-01 16:22:01 -04:00