Commit graph

681 commits

Author SHA1 Message Date
Chris Cormack
9a54047b6d Merge remote branch 'kc/new/enh/bug_5547' into kcmaster 2011-04-08 08:39:14 +12:00
Mark Gavillet
0ee5b38b1c Bug: 5547 - corrected insert to database
Inserting a new category failed because only 10 bind variables were present and 11 were required.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 08:37:54 +12:00
Chris Cormack
363ea5ce08 Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
	installer/data/mysql/updatedatabase.pl
2011-04-05 15:39:12 +12:00
f22b8bcd45 Fix for Bug 5989 - Funds filter does not remember library choice
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-04 22:53:24 +12:00
Chris Cormack
eb4ad6e44e Merge remote branch 'kc/master' into new/enh/bug_5917 2011-04-03 22:35:24 +12:00
Salvador Zaragoza Rubio
689bc19154 Bug 5478 - Automate MARC framework import/export
Module to Import/Export a Framework structure to CSV/Excel-xml/ODS/SQL in Intranet Administration - MARC Frameworks section.
    There are two new links: "Export" to export to a format; and "Import" to import from a file.
    The data exported/imported is the one stored in the MySQL tables marc_tag_structure, marc_subfield_structure.

    Exported works as follows:
    1) CSV: As this format only allows one worksheet, the data from the tables is splitted with a row with #-# cells or with the
    names of the fields of the next MySQL table. Each row has as much cells as fields has the MySQL table. The first row contains the
    field names, the remaining holds the data.
    2) Excel: Excel xml 2003 format. Each MySQL table has its own worksheet in the spreadsheet. Rows and cells data as CSV.
    3) ODS: OpenDocument Spreadsheet compressed format, creates a temporary directory to generate the files needed to create the zip file.
    Each MySQL table has its own worksheet in the spreadsheet. Rows and cells data as CSV.
    4) SQL: Text file, the first row for each table is a delete and the remaining are inserts.

    Importing reads the rows from the spreadsheet/text-file as follows:
    1) CSV: Each row inserts or updates the associated MySQL table for this framework. At the end of the importing for a MySQL table, deletes the rows in the database that don't possess a correspondence with the spreadsheet.
    2) Excel: Imports each worksheet to the associated MySQL table. Works as the CSV for each worksheet.
    3) ODS: Creates a temporary directory to decompress and read the content.xml. This file has the data needed to import.
    Works as the CSV for each worksheet.
    4) Executes the SQL file.
    If the file imported has a different frameworkcode that the framework importing, the framecode is changed along the process.

    The Csv format will be the default.
    It uses perl module Archive::Zip or zip/unzip system command to process ODS files.
    To parse the sql files when importing it uses SQL::Statement or homemade parsing.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 21:17:33 +13:00
Chris Cormack
8e00f55216 Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
	installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
2011-03-30 20:53:45 +13:00
Ian Walls
e57dadf762 Bug 5548: Hard Due Dates Circ Rule
Implements the RFC found at http://wiki.koha-community.org/wiki/Hard_Due_Dates_Circ_Rule_RFC.  See squashed commits
messages below for details of implementation.

Squashed commit of the following:

commit 871b91af00871146eb1216ebf5ce673dda2c5925
Author: Ian Walls <ian.walls@bywatersolutions.com>
Date:   Tue Dec 28 15:09:49 2010 -0500

    Hard Due Dates dev part 3: implementing the due dates in circ

    CalcDateDue now calls GetLoanLength, rather than each invocation running separately one after another.  Therefore, instead of
    the 'loanlength' param, CalcDateDue now takes 'itype', and uses the info to get both the issuelength and the hardduedate info (if it exists)

    Global Due Date no longer populates in the sticky due date field in Circ, since it can't be determined before the item is scanned.  Any specified
    due date still overrides the circulation rules, if allowed.

    Hard Due Dates in the past will return an error message, but can be manually specified if truly desired.

    Also, a small fix to updatedatabase.pl to allow the old data to populate if possible.

commit 14d5505f3c01287a2464a759f0076c1d4b665c49
Author: Ian Walls <ian.walls@bywatersolutions.com>
Date:   Mon Dec 27 18:28:11 2010 -0500

    HardDueDates dev part 2:  adding admin interface

    Adds columns to Smart Rules page, including calendar for easy date selection.

    Removes globalDueDate and ceilingDueDates from system preferences editors

commit 76e3e3d86a7a54c6ce4253e7f68278b4dc75a0bb
Author: Ian Walls <ian.walls@bywatersolutions.com>
Date:   Mon Dec 27 15:58:05 2010 -0500

    HardDueDates dev part 1: database changes

    Adds two new columns to issuingrules, a hardduedate and a hardduedatecompare.  If globalduedate is set, use that as the universal value
    for all circ rules.  Else, if ceilingduedate is set, use that as the universal value.  Adjust the comparison accordingly (-1 before, 0
    exact, 1 after).  the old system preferences globalDueDate and ceilingDueDate are then removed.

    Rebased onto 3.03.00.032

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-30 20:35:45 +13:00
Ian Walls
48ee1dcb3f Bug 5547: Hide Lost Items dev
Adds a Hide Lost Items option to the staff client, as detailed in the enhancement request
at http://wiki.koha-community.org/wiki/Hidelostitems_option_for_the_staff_client_RFC

Minor edits: Whitespace

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-30 20:20:05 +13:00
Christopher Hall
0eb6be9d05 Bug 5917 : fixed branches.pl and made template::param handle empty array/hashes better 2011-03-30 08:55:57 +13:00
Chris Cormack
fbb48436b7 Merge remote branch 'kc/master' into new/enh/bug_5917 2011-03-23 16:56:55 +13:00
Srdjan Jankovic
670a262504 Bug 5928 :wr77152 : AllowPurchaseSuggestionBranchChoice sys pref
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-23 10:35:16 +13:00
Chris Cormack
03890c90ac Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
	installer/data/mysql/en/mandatory/sysprefs.sql
2011-03-21 19:54:11 +13:00
Paul Poulain
ddbedbfc2f Bug 4330 : Adding some copyright BibLibre statements 2011-03-21 10:57:20 +13:00
Sophie Meynieux
6282f652b2 Bug 5889: Messages name in english for notifications on public interface.
Modification of template to allow multilanguage support. Alsa fixing columns
overflow.

BibLibre bug #5939

Tests: It works. Messages strings can now be extracted and placed in .po file
for translation.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 09:25:08 +13:00
Chris Cormack
2c470899b3 Merge remote branch 'kc/new/bug_4438' into kcmaster 2011-03-14 20:48:50 +13:00
Henri-Damien LAURENT
3e297c6cb8 bug4438/MT5496 budget Exceeds total allocation
This is a followup :
When editing a budget, the check for the total allocation would take into account the budget itself.
Showing an improper error message
The problem was solved when adding a child budget but not when editing the same budget.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 20:45:58 +13:00
Ian Walls
4735e296cf Bug 5824: Creating a circ rule for a specific library causes anomalies
The variable name for the current branch being edited was the same as the variable used in
cat-search.inc, which passed along the circ-rule library to circulation.pl, and then overriding
the set library from there.

This patch renames the template variable 'current_branch', so that it does not populate the 'branch'
param in cat-search.inc

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-05 20:38:36 +13:00
Frère Sébastien Marie
55af15be84 Use placeholders in sql
Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-28 08:41:38 +13:00
Christopher Hall
0088c5da53 Bug 5462: fixed current preferences tab highlighting bug created by dashfix
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:58:52 +00:00
Christopher Hall
236ba72ef6 Bug 5462: more dash fixing for variable names within scripts
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:57:45 +00:00
Christopher Hall
f03000f50f Bug 5462: modified intranet scripts to match templates
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:57:24 +00:00
b69ad9de3e Fix for Bug 5650, item type page key wrong
- Fixes for authorised_values.pl and itemtypes.pl
- Hiding table when there are no values to prevent js error
- Hiding table pager when there are no values
- Removing paging code from the script

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-26 19:50:49 +13:00
Henri-Damien LAURENT
9bf9e2d9b4 Bug 4438: incorrect "Budget total exceeds period allocation" error when editing fund
The process in check_parent_total for period allocation was not good.
It took all the children of a period.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-14 09:39:48 +13:00
Chris Cormack
a75a9264e1 Merge remote branch 'kc/new/bug_5240' into kcmaster 2011-01-10 09:16:50 +13:00
Henri-Damien LAURENT
150f67e896 branch transfer limits 2010-12-21 21:18:12 +13:00
Stéphane Delaune
fbfe0276a0 (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for auth_tag_structure.pl 2010-12-21 21:18:12 +13:00
Stéphane Delaune
f1762530d1 (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for marctagstructure.pl 2010-12-21 21:18:12 +13:00
Henri-Damien LAURENT
fb804b6020 Followup admin/categorie.pl
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2010-12-21 21:17:30 +13:00
Robin Sheat
692786b519 Bug 4500 - remove commas from price formatting
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 20:16:06 +13:00
Christopher Hall
50466277f7 fixed preferences with group titles not being displayed 2010-11-26 15:48:00 +13:00
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
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
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
4b69538f9b Fix for Bug 4913 - Budget pages should show currency name instead of symbol
This patch adds a new include file to handle the display of the active
currency name and a warning if no currency is active.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-15 15:13:55 +13:00
Andrew Elwell
9fa574f609 Bug 5385: POD Cleanups (part 1)
working through the master branch to eliminate all
podchecker warnings/errors

Actual improvement to the quality of the POD will
come later (hopefully with assistance of others)

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-12 10:06:55 +13:00
51405bcce4 Fix for Bug 4963, sys prefs need date hints and/or picker
This patch adds the standard date format hint used elsewhere
in the interface.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 15:17:40 +13:00
bd28366523 Fix for Bug 4980 - Acq: pull down 'Restrict access to:' for funds not translatable
Applied Owen's patch to current head, updated de-DE translation. The pull down values are now  translated.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 15:16:50 +13:00
3c36084b29 Fix for Bug 4261 - keyword mapping should show which framework the map is for
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-01 20:34:36 +13:00
7a72f49ecf standardize name of ILS-DI:AuthorizedIPs syspref
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-22 00:17:18 -04:00
dcbcf8815c bug 3881: remove unused OpacPrivacy syspref
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-21 22:21:24 -04:00
b49a0a30a1 bug 4176: remove references to unimplemented system preference MIME
The intended functionality of this system preference was never
implemented.  To avoid template changes prior to 3.2.0, put in
hard-coded string 'CSV' to (accurately) identify the type of
the output files in the affected reports.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-21 21:36:45 -04:00
5bd8e829ae bug 3756: remove more references to disused sysprefs
OPACSubscriptionDisplay
OPACDisplayExtendedSubInfo
OAI-PMH:Set
OAI-PMH:Subset
ILS-DI:AuthorizedIPs
libraryAddress
kohaspsuggest
OrderPdfTemplate
marc
acquisitions

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-21 21:21:21 -04:00
2b8470ddf8 bug 3756: start removing references to disused sysprefs
holdCancelLength
PINESISBN
sortbynonfiling
TemplateEncoding

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-21 20:35:35 -04:00
Henri-Damien LAURENT
45604b8d17 (bug 3536) fix homeorholdingbranch on return
this patch create a new systempreference "homeorholdingbranch"-like used only for returns.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

An additional edit was made to circ/returns.pl by Ian Walls of ByWater Solutions to force the dialog message for the return to
use the branch specified by the new HomeOrHoldingBranchReturn system preference, rather than always Homebranch.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-21 20:04:30 -04:00
Jared Camins-Esakov
9f7f61be4a Fix Bug 5261 broken link in Local Use sysprefs
This patch eliminates the sysprefs-menu.inc include file and changes the
systempreferences.pl and systempreferences.tmpl files to work with the
prefs-menu.inc instead. This will centralize the syspref tabs and make it
easier to modify tabs in the future if necessary.

This commit also changes the default tab to Acquisitions, since the Local Use
tab does not work with preferences.pl at present.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 06:18:44 -04:00
ec3913e1aa Bug 3756 Don't display as local AutoSelfCheckID syspref and others
Improve how sysprefs are extracted from .tmpl file in order not to miss
some of them.
2010-07-26 16:18:37 +02:00
4dc85d2f0a Bug 3756 Difference between original and local sysprefs
Amend Chris N. patch in order to display local sysprefs as the
difference between DB sysprefs and .pref files sysprefs.

As a side effect, local sysprefs editor displays also deprecated
sysprefs which is a feature from my point of view. For example,
GranularPermissions is displayed as a local syspref because it has been
removed recently from admin.pref but hasn't been yet removed from DB
(could be done later with a DB update).

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-15 23:29:32 -04:00
Chris Nighswonger
141313666f Bug 3756: Adding the ability to have localuse systempreferences
Squashed commit of the following:

commit d42198bfadff20f40c38b3d9bc7f210ecc372e7c
Author: Chris Nighswonger <cnighswonger@foundations.edu>
Date:   Mon Jul 12 16:48:16 2010 -0400

    Bug 3756 [4/?] new sys prefs - no way to add a new local use preference

        Fixing Global Administration link

commit 060a52bc8d9da1d83387455967ca05292e5987b9
Author: Chris Nighswonger <cnighswonger@foundations.edu>
Date:   Mon Jul 12 16:45:07 2010 -0400

    Bug 3756 [3/?] new sys prefs - no way to add a new local use preference

        Hiding non-local sysprefs

commit d63858e13037fa91f18bc248ab770d757e31153c
Author: Chris Nighswonger <cnighswonger@foundations.edu>
Date:   Mon Jul 12 16:44:40 2010 -0400

    Bug 3756 [2/?]new sys prefs - no way to add a new local use preference

        Fixing a typo

commit 5b23a615018e049b1e11dbc10b131ecb30dfc6ab
Author: Chris Nighswonger <cnighswonger@foundations.edu>
Date:   Mon Jul 12 15:52:04 2010 -0400

    Bug 3756 new sys prefs - no way to add a new local use preference

        A quick and dirty fix

Signed-off-by: Chris Cormack <chrisc@catalyst.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-15 23:29:30 -04:00
Alex Arnaud
47f49d2e7f (BUG #4857) aqplan.pl: consideration of Planning categories with authorised values
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-24 20:42:47 -04:00
Alex Arnaud
1e8c06c522 (BUG #4521) aqbudgets.pl - Transform undefined budget spent value to 0.00 value
This patch tranform the undefined value of budget spent to a money value which equals 0.00.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-24 14:25:46 -04:00
0700a8b732 bug 4896: granular permissions now always on (DB rev 138)
Per the following koha-devel thread, the use of
staff user subpermissions, AKA granular permissions, is
now the default behavior in Koha.  This patch removes
the GranularPermissions system preference.

[1] http://lists.koha-community.org/pipermail/koha-devel/2010-February/033670.html

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:56:03 -04:00
Garry Collum
34936223f3 Bug 2505: Enabled warnings in patron-attr-types.pl
Fixed all resulting  errors.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 09:49:34 -04:00
6af71b5f8d Fix for Bug 3722 - Branch deletion results in incorrect message
A fix was submitted by Nahuel on 23 Nov 2009 and pushed, but
it combined messages for existing patrons and existing items.
This patch defines separate messages for the various cases and
corrects a typo in the original fix which left existing patrons
unreported.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 20:46:31 -04:00
Nahuel ANGELINETTI
d43cf08837 (MT #2565) fix aqplan csv export, and turn off debug
This fix the csv export that doesn't export correctly the budget name, it's empty column.
And it turn off some SQL debug that slow down the result of the page and the csv export.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-26 10:53:01 -04:00
ef58c445d3 removed needless imports of the YAML module
Removed instances of 'use YAML' that were either completely
unnecessary or which were used only in debug code.  Also
removed a needless import of Data::Dumper.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 23:30:48 -04:00
Alex Arnaud
d6e6d920b5 (BUG #4521) aqbudgets.pl - Transform undefined budget spent value to 0.00 value
This patch tranform the undefined value of budget spent to a money value which equals 0.00.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 10:33:47 -04:00
60be9d291f bug 4509: remove references to PINESISBN system preference
This system preference never worked; also, as far as I can tell,
the PINES oISBN service was experimental, not meant for production
use, and is not currently advertised.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-17 08:59:10 -04:00
f319e850d6 Bug 3768 (Bibliographic Framework Test)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-17 08:26:21 -04:00
Jane Wagner
dc0b98eb9e Bug 3093 add syspref to turn off multiholds button
Having the place multiple holds button at the top of the OPAC and staff search results has caused problems for some sites with tight holds policies; this syspref allows those sites to turn off the button.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-11 07:44:17 -04:00
Chris Cormack
86fbe2ec21 Bug 4405 - Overdues block check out
[Documentation note by RM:

This patch adds a new system preference, OverduesBlockCirc,
that can take one of three values:

  - noblock:      checkouts permitted even if patrons
                  have overdue items (default)
  - confirmation: circ operator asked to confirm checkout
  - block:        checkouts to patrons who have overdue
                  items are forbidden

]

Squashed commit of the following:

commit 6a1f66e0686a14d8a89abfc3fe5978dabd0b7af7
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:27:39 2010 +1200

    Tidy up ready to send patch

commit 4d1398df18dcce4fd888cf17a0e2955fdf6ee1e4
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:26:15 2010 +1200

    Bug 4405 - tidy up

commit 3daeb71bc6b690e18dda96aa3c767c2bb0521038
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:02:04 2010 +1200

    Bug 4405 - Overdues block checkout

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 10:39:11 -04:00
59a6072c77 bug 4333 followup - fix an uninitialized value warning
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 05:50:45 -04:00
Colin Campbell
7604bf89f5 Bug 4333 Fix erroneous message re Active Currency
Script was incorrectly asking user to define an active currency
Now test for active currency in the standard way
Use the currency routines in Budgets where applicable
Move the code paths in the if else to subroutines to clarify flow
Enable warnings

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 05:42:05 -04:00
Henri-Damien LAURENT
e40728f4d5 MT2464 : branch_transfer_limit.pl usability change
Adds branchnames along with branchcodes for display

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:01:27 -04:00
ffdcd06fac Fix for Bug 4424, MARC Framework deletion incorrectly reports usage count
Thanks to Thomas Dukleth for the fix.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 20:59:29 -04:00
c9ba8c899d Merge branch 'bug2505_patches' of git://git.catalyst.net.nz/koha into to-push
* 'bug2505_patches' of git://git.catalyst.net.nz/koha: (24 commits)
  Bug 2505 - use strict and warnings in sax_parser_test
  Bug 2505 - enable warnings for link_bibs_to_authorities
  Bug 2505 - add strict and warnings to perlmodule_ls
  Bug 2505 - add strict and warnings to check_sysprefs
  Bug 2505 - Add commented use warnings where missing in *.t
  Bug 2505 - Add commented use warnings where missing in *.pm
  Bug 2505 - Add commented use warnings where missing in the cataloguing/ directory
  Bug 2505 - Add commented use warnings where missing in the misc/ directory
  Bug 2505 - Add commented use warnings where missing in the tools/ directory
  Bug 2505 - Add commented use warnings where missing in the installer/ directory
  Bug 2505 - Add commented use warnings where missing in the rotating_collections/ directory
  Bug 2505 - Add commented use warnings where missing in the C4/ directory
  Bug 2505 - Add commented use warnings where missing in the serials/ directory
  Bug 2505 - Add commented use warnings where missing in the catalogue/ directory
  Bug 2505 - Add commented use warnings where missing in the sms/ directory
  Bug 2505 - Add commented use warnings where missing in the opac/ directory
  Bug 2505 - Add commented use warnings where missing in the virtualshelves/ directory
  Bug 2505 - Add commented use warnings where missing in the suggestion/ directory
  Bug 2505 - Add commented use warnings where missing in the admin/ directory
  Bug 2505 - Add commented use warnings where missing in the circ/ directory
  ...

Conflicts:
	C4/Auth_with_cas.pm
	acqui/supplier.pl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-23 07:13:37 -04:00
Alex Arnaud
e4addf296f (BUG #4388) aqbudgets.pl: add a column in the table for display the total spent of level and sublevels
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-23 06:42:51 -04:00
Alex Arnaud
8eac9d8180 (BUG #4360) aqbudgets.pl: Adding the hierarchy of budgets in the tooltip
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-23 06:42:49 -04:00
Donovan Jones
bce3e2e619 Bug 2505 - Add commented use warnings where missing in the admin/ directory 2010-04-21 20:20:11 +12:00
Alex Arnaud
2e9c62278c (bug #4318) remove the confirmation step in validating a form
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-16 07:32:58 -04:00
956e0e9c62 bug 4358: remove disused ReadingHistory syspref and related code
The ReadingHistory sytem preference is no longer used, and possibly
was used by only one library anyway.  Removed references to it; note
that had it been turned on, a patron viewing checkout history would have
seen old loans showing up twice.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 10:27:56 -04:00
Paul Poulain
c3fe3af209 Using only default framework for koha2marclinks
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:27:20 -04:00
Lars Wirzenius
2c67656108 Fix FSF address in directory admin/
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:17:50 -04:00
Colin Campbell
a034d305da bookseller is returned as a scalar hashref not an array
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 10:29:48 -05:00
Henri-Damien LAURENT
9d6df13554 (bug #4135) fix aqplan form
This fix the form to have always the submit button, and fix security issue in aqplan.pl(authnotrequired set to 1)

Conflicts solved:

	koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-17 05:10:11 -05:00
2b125a6f93 bug 2885: attempting to add library with existing code now gives error message
If one attempts to add a new library with a code already in use,
an error message is shown.  The main library data input by the user
is preserved, allowing the user to try a new code.

This also corrects a glitch in the previous patch concerning
adding a branch category whose code is already in use.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 21:13:50 -05:00
c097736084 Fix for bug 2885, now an error message is thrown instead of a silent fail
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 20:29:44 -05:00
c5da83f020 remove unconditional warn
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 22:51:51 -05:00
Garry Collum
92702aa010 Bug 2505: Enables warnings in matching-rules.pl.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 22:10:43 -05:00
3d19eb7fef bugs 3912, 4144: can now add contracts if dataformat is not metric
Fixed bug in date validation that prevented adding new contracts
if the dateformat syspref was set to something other than 'metric'.

In process, also removed three hand-written date validation routines
in favor of using JavaScript Date objects and the Date_from_syspref
function provided in calendar.inc.

This fixes bug 3912, and partially addresses bug 4144.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 08:41:47 -05:00
Zeno Tajoli
1d0bd7fc59 Bug 3162 Fix only for [forward port of tempoary fix 3.0.x]
Note that this patch causes the authority subfield visibility
to match 3.0.x, but at a cost - only two options are available now,
hide all and show all, and much flexibility is lost.  This will
need to be improved.

(cherry picked from commit 56831089ed)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 06:23:08 -05:00
Colin Campbell
7f0f83a6ec Enable warnings in koha2marclinks.pl
Fix code generating warnings with warnings enabled

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 21:25:47 -05:00
Colin Campbell
eee07ae861 Enable warnings in marctagstructure.pl
Fix a couple of comparisons generating warnings

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 21:25:45 -05:00
Jane Wagner
f52c54eb35 Bug 3738 Automate login to web-based self-check system
Some small, single-branch corporate and special libraries use unattended self-checkout stations, and would like to automate the staff login, so that just going to the sco/sco-main.pl URL would bring the self-check up ready for patron use.  This patch create three sysprefs, AutoSelfCheckAllowed, and AutoSelfCheckID/AutoSelfCheckPass. If the site wants to allow automated login, staff would then need to create the selfcheck user record and enter that login ID and password into the sysprefs.  The kohaclone/opac/sco/sco-main.pl script has been modified to check these sysprefs and pass values (if present and allowed) into the self-check URL.  The URL then bypasses the staff login page and comes up ready for checkout, waiting for the first patron barcode.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 08:43:07 -05:00
3f45f621e6 Fix for Bug 3970, Warn user when there is no active currency
- Adds warning to budget admin pages
- Adds warning to currency admin page

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-02 18:43:09 -05:00
Nahuel ANGELINETTI
dc9991d9b4 (MT823) add the possibility to have enrolment end date
this patch add the possibility to have an end date of enrolment, instead of a period. Like for a user category, all this category can have the same expiry date.
The librarian can configure one of both, but not both.
2010-01-28 15:11:55 +01:00
Jean-André Santoni
73605d792f [MT2590] Removed root budget duplicate checkings 2010-01-28 15:11:52 +01:00
Matthias Meusburger
0b5cc8f809 MT2345 : Changes on contracts 2010-01-28 15:11:51 +01:00
Paul Poulain
c85e22ad53 aqbudget display, minor changes
- removed 2 total that means nothing (and were troubling users)
- reindented a little (removed tab)
2010-01-28 15:11:50 +01:00
Jean-André Santoni
0ed6bcdabb [MT1234] Huge rewritte to use the API instead of hardcoded SQL in the script
Also fixes a bug in the template.
2010-01-28 15:11:44 +01:00
Jean-André Santoni
10c9610058 [MT1234] Code cleaning 2010-01-28 15:11:44 +01:00
Jean-André Santoni
2a84ad3223 [MT1234] Fixed aqcontract breadcrumb 2010-01-28 15:11:44 +01:00
Jean-André Santoni
922ae0b782 [MT1234] Replaced useless selectbox in the title of contact form 2010-01-28 15:11:44 +01:00
Jean-André Santoni
e7753ce465 [2343] Fix currency not showing in aqbudgets 2010-01-28 15:11:43 +01:00
b6c043147f final fix for sysprefs merge, hopefully
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-27 09:33:14 -05:00
0c3fde5cd3 handle error if no active currency is defined
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-27 09:30:22 -05:00
2c9e28e63e fix silly typo
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-27 09:19:13 -05:00
880a2088ad bugfix - fix compilation error
Reflect change of GetLocalCurrency to GetCurrency
in new_acq

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-27 08:58:26 -05:00
8ad2c7d7ac Merge commit 'pianohacker-koha/prefs-submit' into master
Merge in Jesse Weaver's system preference editor changes.

Conflicts:
	C4/Bookfund.pm
	koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
	koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
	koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-26 20:26:17 -05:00
Henri-Damien LAURENT
d339abf0bf Merge branch 'patroncards-wip' of git://git.foundations.edu/koha into community
Conflicts solved:
	Makefile.PL
	installer/data/mysql/en/mandatory/sysprefs.sql
	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
	installer/data/mysql/updatedatabase.pl
	kohaversion.pl
2010-01-20 23:16:34 +01:00