Commit graph

5525 commits

Author SHA1 Message Date
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
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
Katrin Fischer
4392f44f59 Bug 7749: Not all OKs on the start page are translatable
I don't really understand, why the " OK " would not get picked up by
the translation script, but removing the spaces made it work.

To test:
Verify that all OK buttons on the start page are translatable. The one
resisting translation was "Search catalog:"

Signed-off-by: mveron <veron@veron.ch>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-21 14:36:53 +01:00
4d26038dd2 Bug 6027 - Delete biblios if deleting all their items in batch deletion
Optionally delete bibliographic record when batch deleting items, if no items remain on the record.

Adds deleting of reserves to DelBiblio. Since subscriptions are deleted automatically,
it made sense for deletion of reserves to maintain the same behavior.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
I like the way this works, and it does. Passes tests.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-21 14:31:38 +01:00
Colin Campbell
adb3777e2e Bug 6831: Add ability to enter adding child record from parent
Simplifies the adding of analytical records and ensures that
the data populating the 773 tag is correct. From the host record
add child record is selected and create bib is entered to generate
a new record with host item tag populated from the parent

Caveat: currently prepare_host_field only returns a field for
MARC21. Values for UNIMARC and NORMARC can easily be added but
should be done by someone familar with those formats
and conventions

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
- create a new record
--> if you enter a value in 001 anaytics will use that in $w for linking later
--> if you set 000/LDR 19 - Multipart resource record level to 'a' there will
be a link from the parent record to the child record later
- save your record and go to the staff detail page
- in toolbar select 'New' > 'New child record'
- check field 773, 245 and 001 from the parent record should have been copied there
- check links between child and parent in staff

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed conflicts in all 3 files.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Works properly for MARC21, and follow-up adds support for NORMARC and UNIMARC.
2012-03-21 11:30:35 +01:00
Paul Poulain
f80c926013 Bug 7144 string follow-up: reordering text
the table below show checkout/hold/return, so the description should be in the same order for a better consistency

Plus the term "return" is used elsewhere in the page, so s/checkin/return/
2012-03-21 11:02:01 +01:00
Paul Poulain
9390382a46 Bug 7144 follow-up cleaning for HTML4 coding guideline
http://wiki.koha-community.org/wiki/Coding_Guidelines#Upper_and_Lower_cases_in_strings
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-21 10:28:32 +01:00
Ian Walls
d92c595dc4 Enhancement 7144: Floating Collections (per branch/itemtype)
Adds support for Floating Collections (i.e. items that don't automatically return
home when checked in at another branch) on a per branchcode/itemtype basis.

This patch adds a new column (returnbranch) to the default_circ_rules, default_branch_item_rules,
default_branch_circ_rules and branch_item_rules tables, after the 'holdsallowed' column.  While
this is coded as a varchar(15), the only currently supported values are 'homebranch', 'holdingbranch',
'noreturn' and NULL.

On upgrade, the value of HomeOrHoldingBranchReturn is used to populate the global default (which is
stored in default_circ_rules.returnbranch).

To access this value, use C4::Circulation::GetBranchItemRule.  This subroutine is altered to supply
an additional key, "returnbranch", containing this value (or 'homebranch' as a default).  No existing
usage of GetBranchItemRule should need to be modified.

The use of HomeOrHoldingBranchReturn is removed in AddReturn to instead use this subroutine.  This will
determine, on a more granular level, where the item should be transferred, after all is said and done.  If
'noreturn' is specified, then the material will remain at the branch doing the checking in.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Passes prove t xt t/db_dependent

I was able to make this feature work as advertised.
As noted above, if you want a floating rule applied across all branches, adding a single default rule won't suffice, you'll need to add the rule to all branches. That issue is not related to the functioning of *this* patch however.
2012-03-21 10:28:26 +01:00
Jonathan Druart
692ee0e9da Bug 7166: Adds edit order notes when the basket is closed
When you are on parcel.pl or basket.pl you can now add or edit a note
 for each order.

 To test:
 Create orders with and without note.
 Edit/Add the note on basket.pl page

 Close the basket.
 Check you can add/edit the order note on parcel.pl page

+ From Owen:
Correcting markup issues with modordernotes.pl:

- Adding "rows" and "cols" attributes to <textarea> (required)
- Converting cancel button to link to stay consistent with
  other pages
- Changing page layout to fixed & centered (not sidebar needed)
- Expanding information in breadcrumbs to match information
  on basket.pl

Changing markup around note add and edit links: Moving output
of order note to the end of the table cell, putting it in its
own paragraph, and adding a "Note:" label

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-20 16:45:37 +01:00
Paul Poulain
8086b52ce5 Bug 7235 follow-up: removing some upper cases
(see coding guidelines : Add Item => Add item)
2012-03-20 16:43:01 +01:00
Katrin Fischer
f371b749af Bug 7235: Add order date and checks for permissions
- Adds order date above vendor
- Reordered fields to reflect history of the item
- Order information (order date, vendor) is only shown, when an order exists
- Accession date is only linked, when item was received in acquisition
- Links to basket and invoice are only shown when user has the correct permission
  - order date: manage_order
  - accession date: receive_shipment for invoice
- Changes all dates to use the KohaDates TT plugin
- Corrects display of rental price, removing additional zeros

To test:
1) Create a record with
- 1 item created in cataloguing
- 1 item ordered
- 1 item ordered and received
- 1 item checked out
2) Verify the correct information is shown for each
3) Verify links on the dates work correctly
4) Toggle permissions for the user

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

Followed the test plan and all tests pass.

Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>

changed supplierid to booksellerid

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-20 16:11:44 +01:00
Srdjan Jankovic
dcca450944 Bug 7235: Adding invoice number and vendor name to the moredetail page
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2012-03-20 16:11:41 +01:00
Paul Poulain
a8aa3b05e3 welcome gaetan, you're 179th ! 2012-03-20 15:58:50 +01:00
Gaetan Boisson
d500929cfd Bug 7731 - Library should be used instead of branch and site
standardized the use of the term "library" instead of "Branch" accross the interface and opac

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-20 15:17:08 +01:00
Adrien Saurat
b38aec8aae Bug 7434: Display of issue number for serials in overdues
items.enumchron is now displayed when not null

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-20 13:42:55 +01:00
Julian Maurice
3b0d4e04e0 Bug 6440: Implement OAI-PMH Sets
New sql tables:
  - oai_sets: contains the list of sets, described by a spec and a name
  - oai_sets_descriptions: contains a list of descriptions for each set
  - oai_sets_mappings: conditions on marc fields to match for biblio to be
    in a set
  - oai_sets_biblios: list of biblionumbers for each set

New admin page: allow to configure sets:
  - Creation, deletion, modification of spec, name and descriptions
  - Define mappings which will be used for building oai sets

Implements OAI Sets in opac/oai.pl:
  - ListSets, ListIdentifiers, ListRecords, GetRecord

New script misc/migration_tools/build_oai_sets.pl:
  - Retrieve marcxml from all biblios and test if they belong to defined
    sets. The oai_sets_biblios table is then updated accordingly

New system preference OAI-PMH:AutoUpdateSets. If on, update sets
automatically when a biblio is created or updated.

Use OPACBaseURL in oai_dc xslt
2012-03-20 11:38:26 +01:00
Magnus Enger
aac5379b22 Bug 7696 - NORMARC lacks staff results XSLT
This patch adds NORMARCslim2intranetResults.xsl, to enable XSLT display
of intreanet search results when marcflavour = NORMARC. Most of the
logic is copied verbatim from NORMARCslim2OPACResults.xsl.

To test:

Make sure you have these system preferences set:
marcflavour = NORMARC
XSLTResultsDisplay  = using XSLT stylesheet

NORMARC and MARC21 is similar enough that testing on MARC21 records should
be OK. (I don't expect anyone to do detailed testing of a lot of the different
positions in leader, 007, 008 etc...)

Before the patch: viewing results in the staff client should give an error
message about a missing XSLT file.

After the patch: Record details should be displayed in the search results,
similar to how it is done for MARC21.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-20 11:24:45 +01:00
Elliott Davis
a0e7b0cdcd Bug 5549 : Fixing the opac-pref 2012-03-20 13:31:40 +13:00
Elliott Davis
39e4242e74 Bug 5549 : fixed save in smart-rules 2012-03-20 13:30:56 +13:00
Elliott Davis
ccb5b33b81 Bug 5549 : added dropdown for new rule 2012-03-20 13:30:39 +13:00
Elliott Davis
f6f9bc47ab Bug 5549 : fixed typo 2012-03-20 13:30:08 +13:00
Elliott Davis
f998beba4a Bug 5549 : added select option in circ rules for unit 2012-03-20 13:29:51 +13:00
Colin Campbell
f74da1e834 Bug 5549 : GetPendingIssues now returns DateTime objects
Show due times in addition to dates in using screens
2012-03-20 12:33:37 +13:00
Colin Campbell
8cea8e5cc0 Bug 5549 : Allow hourly loans to be indicated in the loan rules
Add a column indicating whether we are talking days or hours here
This work is merely a holding version pending a better version
2012-03-20 12:07:19 +13:00
b3cae76694 Bug 5596 [REVISED 2] add author to holds to pull report
Adding output of author.

Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-19 18:30:11 +01:00
Jonathan Druart
f3ba35c0a0 Bug 7301: 'From' field is 1 year ago by default
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-19 18:28:17 +01:00