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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Follow up patch for installing pref BasketConfirmations.
Rebased for 3.4.X August 4, 2011.
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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>
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>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 04e97b57ff)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
- 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>
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>
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>
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>
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>