Commit graph

6848 commits

Author SHA1 Message Date
Julian Maurice
5a29c39c9f Bug 7178 follow-up: Do not fill items table with "(undefined)"
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 14:56:03 +02:00
Julian Maurice
f3aa919c50 Bug 7178 follow-up: Fix check_additem when UniqueItemFields is empty
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 14:55:44 +02:00
Julian Maurice
7a81b89357 Bug 7178: Follow-up Improve order item creation
Move SQL code from Perl script to Perl module
Replace SHOW COLUMNS by $dbh->column_info()
Update total on neworderempty.pl when adding or deleting items

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested ok for ordering and receiving items.
Total updated correctly.

Note: There are lots of errors in the logs before and after applying
the patch. A follow up is needed.
2012-05-14 16:16:13 +02:00
Paul Poulain
1d882495c2 bug 7178 follow-up: typo fix
* words lower cased
* removed a space before :
2012-03-26 14:15:14 +02:00
Julian Maurice
eefc774e27 Bug 7178: Acquisition item creation improvement
- Display a unique item block at once

On orderreceive.pl when AcqCreateItem is 'receiving', and on
neworderempty.pl when AcqCreateItem is 'ordering' it displays an
item block with item infos to fill, and a '+' button.
When user clicks on '+', the block is hidden and a list shows up with
the items that will be received. User can then edit or delete items in
the list and click 'Save' to receive items.

- PrepareItemrecordDisplay is now used for cloning block

Previous cloning function was duplicating ids, the side effect is that
plugins didn't work when several items were displayed.
PrepareItemrecordDisplay regenerate the form with new ids

- New system preference UniqueItemFields

Contains a space-separated list of sql column names (of items table).
This syspref is used in two ways:
 - Values corresponding to fields in syspref are not duplicated when
   adding a new item (button 'Add')
 - When saving the form, a check is made on fields in syspref for
   detecting duplicate (in DB and in the form)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests done are noted on the bug report.

2012-03-23: Fixed conflict in updatedatabase.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 11:07:23 +02:00
Juan Romay Sieira
020c095377 Bug 7263 - Determine maximum length of some fields or subfields when cataloguing a biblio or an item.
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 10:51:22 +02:00
Paul Poulain
1474d95c10 Merge remote-tracking branch 'origin/new/bug_7548' 2012-03-23 10:24:19 +01:00
koha
c7256d3447 Bug 7548 Fix variable scoping in the template - Rebased
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-23 10:23:27 +01:00
Juan Romay Sieira
21b3f8a7bf Bug 6140 - Set a timeout to z3950 servers that could have network problems occasionally
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2012-03-22 18:22:02 +01:00
Katrin Fischer
e4c67372e4 Bug 7760 - Add ids and classes to every staff page to help with customization (reports, ...)
This is the last one - adding the classes and ids to the report module and
some template files for smaller moduls/functions.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 18:12:35 +01:00
Katrin Fischer
f8626343e2 Bug 7760 - Add ids and classes to every staff page to help with customization (patroncard, labels)
After talking to Owen we decided to use 2 classes for those modules. I decided on:

patroncard: tools, pcard
labels: tools, labels
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:33 +01:00
Katrin Fischer
d8f8b95f07 Bug 7760 - Add ids and classes to every staff page to help with customization (tools)
Prefix for ids and class is 'tools'

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:32 +01:00
Katrin Fischer
0f39b52048 Add ids and classes to every staff page to help with customization (serials)
http://bugs.koha-community.org/show_bug.cgi?id=7760
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:31 +01:00
Katrin Fischer
1fd4a1e8af Bug 7760 - Add ids and classes to every staff page to help with customization (patrons)
Class is 'pat' and ids start with 'pat_'.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:30 +01:00
Katrin Fischer
caa9ce8238 Bug 7760 - Add ids and classes to every staff page to help with customizaton (lists, suggestion, z39.50)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:29 +01:00
Katrin Fischer
9ab692693e Bug 7760 - Add ids and classes to every staff page to help with customizaton (circulation)
New id: circ_<filename>
New class: circ

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:27 +01:00
Katrin Fischer
9e975aaf24 Bug 7760 - Add ids and classes to every staff page to help with customizaton (cataloguing)
New ids: cat_<filename>
New class: cat

Exceptions:
moveitem and linkitem are accessible from the catalog pages, so have
been made 'catalog' for styling.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:26 +01:00
Katrin Fischer
9c1dcfa2d7 Bug 7760 - Add ids and classes to every staff page to help with customizaton (catalog)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:25 +01:00
Katrin Fischer
84839a93f5 Bug 7760: Add ids and classes to every staff page to help with customizaton (batch, error)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:24 +01:00
Katrin Fischer
25338aa17a Bug 7760: Add ids and classes to every staff page to help with customizaton (cart)
id = cart_<filename>
class = cart

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:22 +01:00
Katrin Fischer
27dd804725 Bug 7760: Add unique ids and a module class to all administration pages
This is the first patch for bug 7760 and touches all pages in administration.
This adds a unique id "admin_<filename>" and a class "admin" to the body tag of
each page in administration.

Note: aqcontract can only be accessed from the acquisition module, so I made it acq
instead of admin.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:18 +01:00
Katrin Fischer
7dec3d8aee Bug 7760: Add unique ids and a module class to all authorities pages
This is the first patch for bug 7760 and touches all pages in authorities.
This adds a unique id "auth_<filename>" and a class "auth" to the body tag of
each page in the authorities module.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:17 +01:00
Katrin Fischer
3c419f2fe6 Bug 7760: Add unique ids and a module class to all acquisitions pages
This is the first patch for bug 7760 and touches all pages in acquisitions.
This adds a unique id "acq_<filename>" and a class "acq" to the body tag of
each page in acquisitions.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:11:54 +01:00
b07e603560 SIGNED-OFF Bug 7590 Cataloging authorities search result page is broken
This bug occurs on UNIMARC DB with authorities linked together with TS/TG
relations. To reproduce it:

- Add a new biblio record
- On 610 field, click on the tag editor button to search an authority
- In the Authority search window, enter a large search
- On the result page, for authorities having relations with other terms, in the
  Get it! column, you get a mess of TS/TG relations and not more Choose link.

Signed-off-by: François Charbonnier <francois.charbonnier@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 18:04:10 +01:00
Paul Poulain
d5542514d2 Merge remote-tracking branch 'catalyst/merged_5549' into new/bug_5549
Conflicts:
	installer/data/mysql/updatedatabase.pl
	members/moremember.pl
2012-03-22 17:34:26 +01:00
Adrien Saurat
31175cbdab Bug 7737: applies date filters on vendor pages
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 17:18:03 +01:00
Katrin Fischer
9809bb6cd5 Bug 5841: Routing slip not displaying publication date
To test:
Compare output of the 2 different links for  printing routing lists.

1) Links in the table of issues on the serial collection page
2) Link following the steps from editing and saving a routing list

Both previews should show the date now.

Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 16:19:45 +01:00
Adrien Saurat
8ca93323fe Bug 6125: repairs dateaccessioned plugin
1/ It now works with neworderempty.pl
2/ The set_to_today function was moved from
additem.tt to dateaccessioned.pl (so it's
available to all pages using the plugin)

Signed-off-by: Julien Sicot <julien.sicot@gmail.com>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 16:18:38 +01:00
Jonathan Druart
bb35b60828 Bug 7154: Modification in borrower attributes
* group some attributes for a more friendly display

* allow a link between a borrower category and an attribute to display
  it only for the specified category

* Attr classes filled with AV 'PA_CLASS' category (you have to create AV
  with a new category 'PA_CLASS' to fill class list)

this patch add 2 fields in borrower_attribute_types :
    category_code
    class

Signed-off-by: Julien Sicot <julien.sicot@gmail.com>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 16:08:28 +01:00
Srdjan Jankovic
f4ab1e836f bug_7264: [SIGNED-OFF] Branch popup on OPAC detail.Added opac_info field to branches table.
Signed-off-by: Delaye stephane <stephane.delaye@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 11:50:00 +01:00
9a8d23da8f Bug 5482 [Follow up] Translation problem in guided reports - Item field names
Making some additional corrections.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 11:16:27 +01:00
Katrin Fischer
791c31eb61 Bug 5482: Update colums.def file
Updates the borrowers and items table descriptions using the
descriptions from the interface and the MARC21 default framework.
Biblio and biblioitems still need some work.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 11:16:24 +01:00
bdb042ed18 Bug 5482 - Translation problem in guided reports - Item field names
This very minor correction adds display of the column name even
if the field description exists in the columns .def file.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Changes the display to show description / table.column.
2012-03-22 11:16:23 +01:00
Jonathan Druart
b8d4e990ad Bug 5180: FIX autocomplete on overdues report
- Switch off the CircAutocompl syspref
- Set a (one or more) patron attr type searchable
- go on the overdues page
Firebug crash and a layout problem appears on the left.

Firebug error is "YAHOO.widget.DS_XHR is not a constructor"

retry with this patch.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 10:45:31 +01:00
985a1bae1b Bug 7732: Restoring "More lists" in the Add-to combo of OPAC Search Results
1) More lists -> More Lists in order to be consistent with context.
2) More Lists is put just before New List at the end of the combo list. (More logical place than between your and public lists.)
3) More Lists is only shown when the number of private or public lists exceeds 9; this is a pragmatic and hard-coded approach for now. Only if there are exactly 10 lists, this does not really add a list. But who cares about that?
4) Resolves a potential bug with an [% END %] at the wrong place. Moved it after the finishing optgroup tag.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Performed a search in the OPAC without the patch and More Lists does
not appear. Applied patch and perfomred OPAC search again and the More
Lists option reappears. Signed off.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 09:06:25 +01:00
Katrin Fischer
116d31a4bb Bug 7738: "Display more constraints' in subfield configuraiton is not properly translatable
The Javascript toggling the link description was checking for the english
link text. This would not work for translated templates.

Tested: Apply patch, then translate update and translate install.
Text changes as appropriate (with manually inserted translation in .po file)

Signed-off-by: mveron <veron@veron.ch>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 09:04:53 +01:00
Katrin Fischer
112f4a179c Bug 7746: "No Public Lists." not translatable.
I applied the patch and did a translate update / translate install.
No public lists is now surrounded by P-tags as expected.

Signed-off-by: mveron <veron@veron.ch>
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
QA Comment:  fixed small typo ('pists' instead of 'lists')

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 09:02:54 +01:00
Adrien Saurat
cd1f39b483 Bug 7771: "Notices" changed to "Notices & Slips"
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 06:24:49 +01:00
Adrien Saurat
ae9ab2c90b Bug 7753: serials-home displays library name instead of code
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 06:14:07 +01:00
Chris Cormack
0c40ff9f98 Merge remote-tracking branch 'kc/master' into merged_5549
Fixed conflicts

Conflicts:
	catalogue/moredetail.pl
	installer/data/mysql/updatedatabase.pl
	koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
2012-03-22 09:36:55 +13:00
Ian Walls
28309bc61e Bug 5549 Followup: fix suspension in days
ISO dates were being compared with DateTime objects, and DateTime::Durations
with integers.  This patch reimplements the _FixFineDaysOnReturn subroutine
to use the new hourly loans functionality.

Also moves date formatting of patron debar date out of circ/returns.pl and into
KohaDates on the template

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-03-22 09:31:11 +13:00
Adrien Saurat
58e3065af4 Bug 7748: use of TT date filter on addorderiso2709
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-21 18:23:39 +01:00
Julian Maurice
f3197e20eb Bug 7169: Follow-up: Change booksellers search results display
- List of booksellers changed to a drop-down list
- Baskets columns renamed and reordered to make them consistent with
  acqui/parcels.pl
- warning in log removed
- changed a '&' to '&amp;' to pass W3 validator

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-21 17:54:00 +01:00
Julian Maurice
d09e428a7d Bug 7169: Change booksellers search results display
- Replace vendor table by a div (avoid table in a table)
- Add two columns in basket tables: biblio count and expected (not
  received) items)
- Replace tablesorter by datatables
- Add a list of all returned bookseller names in top of the page (easier
  to find a bookseller in a large list of results)
2012-03-21 17:53:57 +01:00
95e513f400 Bug 7310 Followup: Warnings for nothingdeleted and somedeleted for staff client.
Test this patch by trying to delete items from a public list that someone else created (so you do not have sufficient permissions). Check the warning.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
2012-03-21 16:47:33 +01:00
c4d21bcbfe Bug 7310: Code changes for Improving list permissions
This lays the foundation for further changes for report 7310.
Implements following points from the wiki page List permissions:
1) Preference that controls if users may create public lists in opac.
2) New add/delete own/delete other permissions per list.

Code has been changed (in some cases refactored). New permissions are not yet visible; with this patch current functionality is kept as much as possible while resolving several issues, improving permissions and extending the code for further developments (using the new permissions and sharing lists).

Feb 23, 2012 (revision): Changed defaults for new lists. Could also remove routine GetRecentShelves by using GetSomeShelfNames in catalogue/search.pl just as opac-search.pl already did. (More consistent.)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>

Feb 29, 2012: Automerge version.
March 5, 2012: Rebase for pushed 4912 patch.
March 21, 2012: Rebased. Resolving some conflicts in relation to pushed report 7719.
2012-03-21 16:46:40 +01:00
8cff38fb24 Bug 7310: Improving lists permissions -- New prefs
Adds two new preferences to OPAC/Policy tab.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
2012-03-21 16:46:27 +01:00
Magnus Enger
20fd03724a Bug 7092 - Complete-subfield searches TraceCompleteSubfields syspref not working correctly
This patch adds a syspref UseICU for toggling between using "" and {} for
quoting in subject tracings. With normal Zebra indexing, "" must be used. With
ICU Zebra indexing, {} must be used.

This syspref interacts with TraceCompleteSubfields and TraceSubjectSubdivisions.

To test:

- marcflavour = MARC21
- make sure you have a record with a "complex subject", like
  "Internet -- Law and legislation"

Toggle UseICU, TraceCompleteSubfields, and TraceSubjectSubdivisions and check
that you get the expected results for the clickable links in the OPAC detail
view:

TraceCompleteSubfields   = Don't force
TraceSubjectSubdivisions = Don't include
UseICU                   = Not using
  opac-search.pl?q=su:"Internet"
UseICU                   = Using
  opac-search.pl?q=su:{Internet}

TraceCompleteSubfields   = Force
TraceSubjectSubdivisions = Don't include
UseICU                   = Not using
  opac-search.pl?q=su,complete-subfield:"Internet"
UseICU                   = Using
  opac-search.pl?q=su,complete-subfield:{Internet}

TraceCompleteSubfields   = Don't force
TraceSubjectSubdivisions = Include
UsingICU                 = Not using
  opac-search.pl?q=(su:"Internet") and (su:"Law and legislation.")
UsingICU                 = Using
  opac-search.pl?q=(su:{Internet}) and (su:{Law and legislation.})

TraceCompleteSubfields   = Force
TraceSubjectSubdivisions = Include
UseICU                   = Not using
  opac-search.pl?q=(su,complete-subfield:"Internet") and (su,complete-subfield:"Law and legislation.")
UseICU                   = Using
  opac-search.pl?q=(su,complete-subfield:{Internet}) and (su,complete-subfield:{Law and legislation.})

Check that clicking on the generated links gives the expected search results,
but with normal and ICU indexing. (I have actually not tested this with ICU, so
doing that before signing off is crucial.)

UPDATE 2012-03-16:

Changed the name of the syspref from TracingQuotes to UseICU after a suggestion
from Paul P., to make it more generally useful.

I have used "Using/Not using" instead of "Use/Don't use" in the description of
the syspref, to reflect the fact that this syspref will not change how Zebra
does its indexing - it's just a way of telling Koha how the indexing is
actually done.

I have also set UseICU = 1 in updatedatabase.pl, since that will preserve the
current behaviour of Koha, but UseICU = 0 in sysprefs.sql, since most new
installations will not have ICU activated.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-03-21 14:53:14 +01:00
Katrin Fischer
87e5e45649 Bug 7734: NO_LIBRARY_SET should be translatable
To test:
- Make sure you are logged into Koha as 'root' user - not superlibrarian
- Before the patch the label will show 'NO_LIBRARY_SET', after applying
  the patch it will be 'NO LIBRARY SET' without underscores.
- Verify correct description is shown after selecting a library.

Signed-off-by: mveron <veron@veron.ch>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-21 14:40:59 +01:00
Adrien Saurat
813648526d Bug 7744: use of TT date filters on basket pages
TT date filters added on basket.pl and neworderempty.pl

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-21 14:38:23 +01:00