Commit graph

13637 commits

Author SHA1 Message Date
Srdjan Jankovic
5bcb1529bc wr76595 (bug 4157): Control barcode display with a borrower attribute
Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 14:54:50 +12:00
Srdjan Jankovic
0ccc89990b Bug 4157: Display of barcode in checked out items in OPAC
wr76595: barcode display

Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 14:54:33 +12:00
Chris Cormack
e9f8f44dd4 Merge remote branch 'kc/new/enh/bug_5839' into kcmaster 2011-04-05 14:50:58 +12:00
ff17b6b26f Follow up fix for 5839 (items stocknumber)
New installer file for norway was not yet included. Tested with mysql.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 14:49:50 +12:00
Christophe Croullebois
6a7470341a Bug 5963 : Add the ability to filter budgets using the active column
(MT #4717) Add the capability to have a filter by active budget

the sub GetBudgetHierarchy return aqbudgetperiods.budget_period_active to have acces to a new filtering way,
 more the neworderempty.pl page have a check box "shox all".

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

Bug 5963: Modify GetBudgetsHierarchy to returns all funds

GetBudgetHierarchy now returns all funds, not only those that are part
of an active budget.
Fixed a layout problem.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 14:38:41 +12:00
Christophe Croullebois
1f323c00a1 Bug 5949 : Popup alert when deleting items from basket, also change planning value to statistics
(MT #2391) : acqui/neworderempty.pl

Multiple fixes in neworderempty.pl, mainly about Modify order line page, link to edit catalog, user can delete items with popup information and can't add items also with popup explanation.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- changed the the link from 'Edit Catalog' to 'Edit record' (like on result list)
- changed position of 'Edit record' to be shown behind the label 'Catalog details' instead of showing behind the Title.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 14:20:59 +12:00
Alex Arnaud
3603ae6274 Bug 5947 Suggestions : add date to the search query
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes searching by dates, like 'Suggested on:'
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 11:06:28 +12:00
0dba0e0d3c Bug 3628: opacSerialDefaultTab
This partial fix makes this existing pref visible in the interface.
It should work for UNIMARC. Some work still needs to be done at the MARC side.

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 10:14:13 +12:00
Christophe Croullebois
5910b59d1d Bug 5962 : Budgets showing when they shouldn't (MT #4717) Bug in Koha 3.2 on acqui-home.pl
In the screen all the budgets with budget_branchcode=NULL were displayed even if the budget_owner_id was not NULL. This patch fixes the bug

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Add a new fund, leave library empty, owned by yourself
2) Go into the database and change aqbudgets.budget_branchcode to be NULL
3) Check acq home. Before patch the fund will not show up, although it's owned by you.
After patch it will.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 10:11:49 +12:00
4f2dbc193b Fix for Bug 5991 - Javascript error on purchase suggestion pages
Rebased on master 2011-04-04

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 10:10:42 +12:00
Chris Cormack
88b3711ca9 Merge branch 'new/bug_5307' into kcmaster 2011-04-05 10:06:02 +12:00
Frédérick Capovilla
0a43ba114d Corrects an error when showing a suggestion linked to a deleted budget.
If a suggestion is associated to a budget that was deleted, an error was
returned because we try to get the name of a budget that doesn't exist.
With this fix, the page is shown without errors.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 10:04:08 +12:00
Paul Poulain
ff8ad64c27 Bug 6046: suggestedby list on she filter was not created properly
The suggestedby patron list contained empty lines. This was because retrieving patron name was not correct

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 09:59:27 +12:00
Paul Poulain
09e2ee6058 Bug 6043: SQL error when IndependantBranches=ON on suggestion
On suggestion page, when IndependantBranch=ON, the SQL built is wrong:
branchcode is ambiguous

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 09:54:19 +12:00
Paul Poulain
a56e1e1729 Bug 6045: Accepted by is empty when accepting from list
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 09:22:50 +12:00
Chris Cormack
7003c74321 Updating database version 2011-04-05 09:21:49 +12:00
Katrin Fischer
a8ffb2273b Bug 5860: Adding duplicate stocknumber fails silently
When adding a duplicate stocknumber the duplicate was not saved to the database.
This happened, because the field stocknumber in table items was declared to be unique.
Discussion on bug suggests to lift this restriction.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested. Corrected typo in updatedatabase script. Version 3.01.00.095 introduced the index with double s, although structure had only one s in index name.
Unaware of this bug, I entered the more general bug 6041 for similar problems with modifying items.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-05 09:16:36 +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
koha-preprod
9dc69cf47f Adding a javascript function to check the validation of a record with a budget.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-04 22:51:10 +12:00
Christophe Croullebois
b9d434c18f Bug 5948 : Creation of a quantity column in receipt summary
In receipt summary the quantity did'nt appear in already received table, this patch fixes the omission

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch tested on current master. Works like advertised.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-04 21:39:23 +12:00
Katrin Fischer
26a1a538a4 Bug 5839: Add mapping for items.stocknumber to MARC21
This patch adds 953$i 'Inventory number' to the frameworks.
952$i inventory number is not repeatable, not mandatory and mapped to items.stocknumber.
In a later patch a search index will be added to make inventory number/stocknumber  searchable.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-04 21:27:01 +12:00
Katrin Fischer
b3efa877e7 Bug 5839: Add index stocknumber on 952$i
This patch adds a new index for stocknumber on field 952$i.

Note: For testing you have to copy over the changed files
from  kohaclone/etc/zebradb/ to your koha-dev/etc/zebradb folders.
Reindex.

To test:
1) Add 952$i to your frameworks
2) Add an item with 952$i
3) Search for your 952$i value in keyword search
4) Search for stocknumber, using stocknumber:<your 952$i value> or inv:<...

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-04 20:52:11 +12:00
e1a0b4ab53 bug 4865: added dependency for using memcached for sessions
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-04 10:38:51 +12:00
Chris Cormack
ead56def26 bug 4865: Enable session storage in Memcached
Note: this requires CGI::Session::Driver::memcached to be installed

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-04 10:38:50 +12:00
Jared Camins-Esakov
f0b17df29a Fix two small typos in MARC21 field 006 value builder
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-04 08:56:14 +12:00
Chris Cormack
56d7ab5a19 Merge remote branch 'kc/new/enh/bug_5548' into kcmaster 2011-04-02 19:58:17 +13:00
Colin Campbell
78dfaa1831 Bug 5548: Correct punctuation in patch
Punctuation should be a semi-colon not a comma
It works but is a trap for the unwary in the future

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-02 19:57:13 +13:00
Chris Cormack
f8ea370fdd Merge remote branch 'magnus/bug6002-sample-data' into new/enh/bug_6002 2011-04-02 19:51:27 +13:00
Stéphane Delaune
9624644860 Bug 5870 : Follow up clean up patch
(MT #4626) followup debug suggestion management : "accepted by" was not correctly displayed on suggestion's edit page

    suggestion's status, document's type and "accepted by" was not correctly displayed on suggestion's edit page
    (link with MT #4585)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-02 19:39:48 +13:00
Paul Poulain
940ee0882a Bug 5870 : suggestion management enhancements
* changing suggestedy management
* adding a new status field & filter

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-02 19:38:56 +13:00
Henri-Damien LAURENT
63f1ea0c2d Bug 6026 : export.pl : removing useless condition
Some conditions added AND items.biblionumber=biblio/biblionumber
where JOIN USING (biblionumber) already added that.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-02 07:49:45 +13:00
Chris Cormack
1c89ef1af4 Updating version 2011-04-02 07:18:32 +13:00
Chris Cormack
75aa5398c5 Merge remote branch 'kc/new/enh/bug_4421' into kcmaster
Conflicts:
	C4/XSLT.pm
	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
	installer/data/mysql/it-IT/necessari/sysprefs.sql
	installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
	installer/data/mysql/updatedatabase.pl
2011-04-02 07:15:47 +13:00
Jared Camins-Esakov
f1663ada48 Bug 4421: Add alternate holdings display and prefs
This patch adds the ability to specify a field with alternate holdings
information for display when a biblio has no items associated with it.

Two sysprefs are added:
* AlternateHoldingsField specifies what field/subfields contain the alternate
holdings information. When blank, the alternate holdings information is not
displayed. The default is blank, as this is a new feature.
* AlternateHoldingsSeparator specifies the string to be used to separate
multiple subfields in the alternate holdings display. The default is ' '.

Example use case:
A library which does not have a 1-1 relationship between uncontrolled 852 fields
from a legacy system and actual physical items on the shelf wishes to display
holdings information from the 852, but does not want to create item records
which are almost certain to be inaccurate. By enabling the alternate holdings
feature (AlternateHoldingsField = '852abcdhi' and AlternateHoldingsSeparator =
' -- '), the library is able to gradually add item records as they locate the
physical items, without losing the holdings information presently stored in the
uncontrolled 852 fields.

To test:
1) Set AlternateHoldingsField to '852abcdhi'
2) Set AlternateHoldingsSeparator to ' -- '
3) Change the hidden value of subfields 'a', 'b', 'c', 'd', 'h', and/or 'i' of
   field 852 to 0 so that they display
4) Create a record which has data in the 852, but no item record
5) Look at holdings tab, where the data you entered should be displayed

Proof-of-concept initially developed for the American Numismatic Society.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-02 06:56:02 +13:00
Chris Cormack
937f27e619 Merge remote branch 'kc/new/enh/bug_5548' into kcmaster 2011-04-02 06:44:40 +13:00
Ian Walls
1b402c7422 Bug 5548 Follow up: Confirm Checkout message where it shouldn't be
Fixes the main Hard Due Dates conditional to first check for the existence
of $hardduedate, then the existences of its ISO export, then finally that that
value is not '0000-00-00'

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-02 06:42:07 +13:00
Paul POULAIN
624ebb6e03 Bug 5625 : adding missing title (needed for lateorders.pl)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-02 06:28:58 +13:00
Frédérick Capovilla
f7d9ebbff3 Bug 3727: Corrects the behaviour of the itemtype selectbox in addbiblio.pl
If the subfield is set as mandatory with an empty default value, an
empty value is added in the selectbox and this value is selected by
default. Before, the first element was automatically selected, so it was
easy to forget to set this mandatory value.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-02 06:21:58 +13:00
Robin Sheat
dc37fe9730 Small patch to make myself feel important
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-02 06:10:44 +13:00
Chris Cormack
ce037a96eb Merge remote branch 'kc/new/enh/bug_5432' into kcmaster 2011-04-02 06:08:43 +13:00
17d9903a96 Follow-up fix for Bug 5432 - Duplicate patron feature
circ-toolbar.inc should get the same modification so that
all patron-related pages have the 'duplicate' button

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-02 06:07:41 +13:00
Liz Rea
c9bef775cf Bug 6006 - Move location from current location to home library column on detail.pl
It doesn't make sense to have the home library's location (example: Adult) in
the "current (branch) location" column, since that location is assigned by the
home library.

This patch moves it to the "home location" column, where it belongs.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 21:56:17 +13: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
ruth@bywatersolutions.com
61e87362c4 Bug 5857: longoverdue.pl needs a quiet mode for batch runs
This patch creates a --quiet flag for longoverdue that will squelch
the summary at the end of the run.  It also silences an unnecessary
warn in C4/Acounts.pm

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 21:13:04 +13:00
Julian Maurice
d63eda645c Bug 5952: Add another tab for relatives issues
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 21:03:15 +13:00
Matthias Meusburger
6b2b62eb57 Bug 5952: Shows member relatives in issues lists
Duplicate of '[PATCH] MT3747: Shows member relatives in issueslists' : Subject was wrong

MT3747, Follow-up: Adds siblings issues

MT3747, Follow-up: Shows member relatives in issues lists

 - Now displays patron's and relatives' issues apart

MT3747, Follow-up: Shows member relatives in issues lists

 - Removes renewal in circulation.pl
 - Adds links to moremember.pl

MT3747, Follow-up: Shows member relatives in issues lists

 - Remove unuseful warn

MT3747, Follow-up: Shows member relatives in issues lists

 - Removes renewal in moremember.pl

MT3747, Follow-up: Shows member relatives in issues lists

 - Adds sorting for circulation.pl

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 21:03:14 +13:00
e5010b283e Bug 5401, WYSIWYG for Koha news: Testing TinyMCE
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 20:35:49 +13:00
Frédérick Capovilla
21993ab00a Escape the double quotes in authority search queries to prevent errors.
Before this fix, any search with double-quotes would return an error
500.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 20:32:27 +13:00
Chris Cormack
4d4e4abfae Bumping database version 2011-04-01 20:25:47 +13:00
Katrin Fischer
c0ca9f3413 Bug 5959: Add search link for analytics to serial records
This will work similar to 'Show volumes' links from traced series records and
set records. A link to search for analytics linked to serials.

A new syspref will be added: UseControlNumber.

This syspref will make it possible to determine, if $w and Controlnumber are
used for linking of records in bibliographic records.

If syspref is OFF (default), the search links will not use control numbers
but keywords.
If syspref is ON links will be built using Control-number and rcn index.

NOTE: 773$a is added to index Host-item. For testing on a dev installation:
copy record.abs to your koha-dev folder and reindex!

Rebased against 3.03.00.035 and a small typo fixed by Jared Camins-Esakov.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 20:23:30 +13:00