Commit Graph

17066 Commits

Author SHA1 Message Date
Colin Campbell b9ccc51841 Bug 5450 Avoid a name clash in ILSDI modules
C4::ILSDI::Utility exports a subroutine CanBookBeReserved
Both ILSDI were also importing a subroutine of that name from
C4::Reserves Remove conflict by listing subroutines
imported from C4::Reserves explicitly

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-01 10:05:51 +13:00
Owen Leonard e7321e1a7f Fix for Bug 5402, "add to cart" shown on checkbox hover
This patch removes the title hint altogether. The checkbox might
be used for the cart, lists, holds, or tags, and expressing this
in a title hint seems overly complicated.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-01 10:02:30 +13:00
Galen Charlton d056b2f62a bug 4451 followup - don't need /g for this replace
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-30 14:29:17 +13:00
Owen Leonard 3f5d9537db Fix for Bug 4451 Batch item tool can't process file with Windows line endings
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-30 14:29:04 +13:00
Owen Leonard 781b4e5fae Fix for Bug 4981, Tweak style of item listing on MARC display
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-30 08:50:06 +13:00
Owen Leonard 083d3b1a92 Fix for Bug 5051, Renewal due date doesn't always show on patron Checkout tab
Display of the renewal date footer in the template was conditional upon
the existence of checkouts from today.

In order to fix this bug it was necessary to repeat the markup for the
table footer twice in the template, so I created an include file for it.
The same include file can now be used in moremember.tmpl.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-30 08:38:43 +13:00
Owen Leonard 16c891092f Fix for Bug 5269 - link to patron edit form when editing turned off
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-30 08:32:05 +13:00
Chris Cormack a057f8b7e2 Merge remote branch 'kc/new/bug_5281' into kcmaster 2010-11-30 08:17:40 +13:00
Owen Leonard cc57c2688d Fix for Bug 5281, "Check in" then "Renew" checkboxes checked in the same time
This fix corrects the behavior of the checkboxes whether the user clicks the
checkbox itself or the <td> around it. Tested on a PC in Firefox 3.6, Chrome,
Safari 5, and IE 8.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-30 08:15:34 +13:00
Chris Cormack 9c303a4e95 Merge remote branch 'kc/new/enh/bug_5430' into kcmaster 2010-11-30 07:02:18 +13:00
Katrin Fischer f90f92f80f Bug 5430: Follow-up, fixes error message when no 001 exists
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-30 07:01:17 +13:00
Chris Cormack 110c36bbfc bug 5217 incrementing db version number 2010-11-30 06:57:09 +13:00
Galen Charlton 3111360890 bug 5127: database update to add the suggestion notification templates
Being especially careful to not scribble over any ones
that the library might have already defined.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-30 06:47:52 +13:00
Galen Charlton 7fd45b9861 bug 5127: sample notice templates for suggestions
* supply default suggestion status change email
  templates.
* remove the deprecated mail_suggestion_*.tmpl files

There are a couple suggestion statuses referred to
in the code and suggestion management page that currently
do not have notice templates defined: ASK and CHECKED.  These
seem to be internal, so perhaps default message templates
are not needed for these.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-30 06:47:52 +13:00
Galen Charlton d3df54d052 bug 4211: ensure that suggestion emails have full details
Because of how the ModFoo routines work, if you are only
changing selected columns but are also using the change
as a trigger to place a message in the queue, you need
to fetch the full row before generating the message.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-30 06:47:52 +13:00
Galen Charlton 994d6e2aac bug 4211: more fixes to suggestion letter template handling
* Now displays the correct list of fields to choose
  for suggestion letters.
* Clean up mixture of old and new column selection code
  introduced in commit 88bb1b63, thereby restoring
  the intent of the patch for bug 3522.
* Enable suggestion library to be used in suggestion
  letter templates

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-30 06:47:52 +13:00
Chris Cormack b1c2d560b6 Bug 4211: This patch should provide a working way to send out mail from suggestions
Your suggestion notices template needs to contain things like
<<suggestions.title>>
<<suggestions.author>>
etc

Squashed commit of the following:

commit 3f4278bbe8d4c68be9f72d50e1eef6a411dc873d
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Aug 13 09:41:34 2010 +1200

    bug 4211 parsing the letter before we enqueue it

commit ecdc0ff34c1aa9b96b68d541423ca693e2d63e67
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Aug 13 09:32:09 2010 +1200

    Changing the query to fetch suggestions data, this is needed for suggestion mail to be sent

commit ece11d015b945ce119cf7cbc5e2563f4bc8aecf9
Author: Owen Leonard <oleonard@myacpl.org>
Date:   Thu Aug 12 12:36:26 2010 -0400

    Fix for Bug 4211, Acquisitions actions on suggestions don't generate email

    Assuming 1) The patch for Bug 5126 is approved and 2) Suggestions
    notices are added by hand (or from default sql--see Bug 5127) this
    correction should get suggestions notices properly enqueued.

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

commit 5c3bbe7d557b1994be72518746217fc6fc4e5b83
Author: Owen Leonard <oleonard@myacpl.org>
Date:   Thu Aug 12 12:27:33 2010 -0400

    Fix for Bug 5126 - Suggestions module missing from "add notice" form

    - Adding "suggestions" entry
    - Re-ordering options in alphabetical order

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

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-30 06:47:52 +13:00
Christopher Hall 50466277f7 fixed preferences with group titles not being displayed 2010-11-26 15:48:00 +13:00
Christopher Hall 6882fa0fdb fixed loop variables 2010-11-25 11:07:51 +13:00
Katrin Fischer 703156daee Bug 5430: Add Control number as option to OPACSearchForTitleIn
Makes {CONTROLNUMBER} available as new placeholder in
system preference OPACSearchForTitleIn.

{CONTROLNUMBER} will be replaced by the number in tag 001.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-25 08:26:33 +13:00
Christopher Hall dc76447db6 removed pref from list of file types and fixed FOREACH bug, now some preferences render properly 2010-11-24 16:46:46 +13:00
Owen Leonard 88a15a71d5 Fix for Bug 5240 - next link hidden on edit subfields
This patch removes the pagination altogether, displaying
everything on one page. It also moves some HTML out of the
script and into the template.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-22 13:43:20 +13:00
Chris Cormack e04be3a48c Merge remote branch 'kc/new/bug_5175' into kcmaster 2010-11-21 10:44:16 +13:00
Katrin Fischer 455c87d96e Bug 5175: Publisher link breaks display, if no publisher exists
If there is no publisher the empty publisher link will break the record display
in staff and intranet.

This patch adds a check for existence of subfield b.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-21 10:40:57 +13:00
Christopher Hall c190d93a12 Merge branch 'master' into template_toolkit 2010-11-19 10:11:47 +13:00
Christopher Hall 675a322d43 added .pref to list of extensions to 'convert' 2010-11-19 09:57:42 +13:00
Chris Cormack 0874050dc6 Merge remote branch 'kc/new/bug_5004' into kcmaster 2010-11-19 09:53:19 +13:00
Owen Leonard 14b66041f0 Another bug 5004 fix, this time for road types
The road types interface didn't block deletion of road
types in use, but the script included the same queries
that cities.pl did, as if it intended to.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-19 09:29:48 +13:00
Owen Leonard a36a7e1e61 Fix for Bug 5004, Don't block deletion of cities when instances exist in borrowers table
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-19 09:28:33 +13:00
Christopher Hall 673b62d66b now ready for testing 2010-11-18 16:55:21 +13:00
Chris Cormack 40bb99763d Bug 4440: Fixing template syntax errors 2010-11-18 15:29:04 +13:00
Frédéric Demians 3c756153d2 Bug 4440 Follow-up for English typography and alignment
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-18 14:33:30 +13:00
Koustubha Kale 317be67924 Bug 4440 Layout tweaking follow-up patch
Couple of tweaks to borders and Name.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-18 14:33:29 +13:00
Koustubha Kale 7f0c1e4fcb Bug 4440: Revised combined patch to print fee receipts and invoices
This patch adds a small enhancement to allow printing of Fees  / Fines
receipts from the Fines page.

Patch adds print links to the Fines page next to Fines or Receipts
transactions.

Clicking on the link will pop a new window and will print that with
total outstanding as on date.

You can edit koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
to better control printing this type of material.

18-Oct-2010 Changed template and script names to match. Corrected
invalid markup in the templates.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-18 14:33:27 +13:00
Tomás Cohen Arazi d13d96614b Bug 5412 double quotes break coins and thus search results in some scenarios
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-18 14:22:56 +13:00
Christopher Hall 28641cc590 small fixes, seems to generate working opac and intranet 2010-11-18 14:12:38 +13:00
Frédéric Demians 879363c36c Bug 5204 Followup
- Typo
- Duplicate 955 tag

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-18 13:03:50 +13:00
Zeno0 Tajoli 9ee8ffba79 bug 5204: Unimarc XSLT, from French to English.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-18 13:03:47 +13:00
Chris Cormack 0215ea99ef German and italian language updates 2010-11-18 11:28:52 +13:00
Chris Cormack 6ea5246661 Merge remote branch 'kc/new/bug_5066' into kcmaster 2010-11-18 09:43:25 +13:00
Marcel de Rooy 1bd67e28e5 Bug 5066 (Log timestamp consistently in _session_log)
Small fix with thanks to Galen.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-18 09:00:10 +13:00
Owen Leonard c55f8ffca7 Bug 2122 follow-up for authorities editor
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-17 21:21:32 +13:00
Owen Leonard 240ce5a31c Fix for Bug 2122, Grayed out Fields not always visible
- Adding "readonly" class to readonly fields to guarantee
  that readonly state is indicated visually
- Adding "locked" icon to the background of readonly
  fields for additional visual feedback

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-17 21:21:29 +13:00
Owen Leonard 61c7ba4104 Fix for Bug 5152 - confirm buttons different styles on lists
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-17 21:12:24 +13:00
Owen Leonard bbb0819f0f Fix for Bug 5037 - If patron category is empty it shouldn't show
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-17 21:07:13 +13:00
Owen Leonard b050029c65 Fix for Bug 3013, Value builder for 006 and 008 need choices for all format types
This partial fix adds a complete list of values for 006/00, "Form of material,"
following the list found here: http://www.loc.gov/marc/bibliographic/bd006.html

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-17 21:01:52 +13:00
Colin Campbell b97c4dba7a Bug 4074 Fix fail to parse simple qualified search
Searches such as au,phr and kw,wrdl were passing through the regexes
that should replace colon with equals
add wrdl and phr
use trn so not just rtrn is spotted
Where we were checking for multiple spaces specify that in the
regex not just two spaces

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-17 17:03:04 +13:00
Chris Cormack 0fa9ade9ff Brooke caught my april fools trick, its not 20004 yet!
Ok it wasn't an april fools trick, but just a typo, april fools trick
sounds better though right?

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-17 16:31:14 +13:00
Chris Cormack b5b85143e8 Merge remote branch 'kc/new/enh/bug_4866' into kcmaster 2010-11-15 21:34:39 +13:00
Galen Charlton 20be558069 bug 4866 follow-up - minor code formatting cleanup
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-15 21:33:56 +13:00