Commit Graph

34374 Commits

Author SHA1 Message Date
Jared Camins-Esakov 141048bd97 Merge branch 'bug_9831' into 3.14-master 2013-04-25 22:13:28 -04:00
Mathieu Saby 5959154bc1 Bug 9831: Correct and add authorised values un French UNIMARC installer
2d version, Correcting a typo

In French UNIMARC mandatory installer, some authorised values for languages, countries and unimarc function codes are wrong.
A lot of unimarc function codes and language codes are missing.
Reference for country codes is ISO 3166-1 standard
Reference for language codes is ISO 632-2 standard
Reference for Unimarc function codes are Unimarc Manual (french version online in BNF website and ABES website)

This patch correct wrong values and add new ones.
For the moment I keep some wrong codes, because they may be used by some librairies :
- language codes deu, lan, mla, sam
- function codes 571, 573, 574, 575

To test :
1) take a fresh new koha
2) apply patch
3) install Koha, choosing French UNIMARC settings
4) look if values are OK in authorised values and if you can use them in cataloguing module

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
SQL change only, French installer installs authorised values
without problems.

Note: There is a problem loading sample labels unrelated to this
patch:

sample_labels.sql
ERROR 1146 (42S02) at line 3: Table 'koha.labels_templates' doesn't exist
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 22:13:25 -04:00
Jared Camins-Esakov fe85af6929 Merge branch 'bug_10045' into 3.14-master 2013-04-25 22:11:23 -04:00
Katrin Fischer cd14dae772 Bug 10045: Switch budget to fund in suggestions
Labels are budget, but should be fund.

To test:
1) Check the table on the suggestions page.
2) Check the suggestion edit form.
3) Check the suggestion display.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 22:11:20 -04:00
Jared Camins-Esakov 8f40b04dcc Merge branch 'bug_10106' into 3.14-master 2013-04-25 22:08:33 -04:00
Owen Leonard fc34239c7d Bug 10106 - Markup error causing misplacement of "reopen" checkbox on invoice edit screen
A misplaced closing </li> causes the "reopen" checkbox to be misplaced
if you're editing the a closed invoice. This patch puts the </li> in its
proper place.

To test, view a closed invoice (Acquisitions -> Vendor -> Invoices) and
confirm that the "reopen" checkbox is correctly placed.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Problem easy to spot, patch fixes it perfectly.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 22:08:30 -04:00
Jared Camins-Esakov 8ffd35d8c1 Merge branch 'bug_8068' into 3.14-master 2013-04-25 22:06:12 -04:00
Katrin Fischer 8e222dcdcc Bug 8068: Standardize terms used on acquisitions statistics
branch > library
budget > fund
bookseller, supplier > vendor
and capitalization

To test:
1) Go to Reports > Acquisitions statistics
2) Check the labels and options of the form for correctness.
3) Run a few test searches to make sure functionality is
   unchanged.

Unfortunately, some strings are from the .pl file, so a follow
up moving those to the templates is needed.
To make the changes consistent I have changed them in the .pl file.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 22:06:08 -04:00
Jared Camins-Esakov 0b21236d2e Merge branch 'bug_9766' into 3.14-master 2013-04-25 21:56:51 -04:00
Owen Leonard 28518a033b Bug 9766 - Remove YUI menu on budget planning page in favor of different column-hiding system
The budget planning table previously used a YUI menu as part of a
system for hiding and showing table columns. Instead of trying
to convert that sytem to Bootstrap I have used code from the
batch modification/deletion pages which uses a list of checkboxes
to show and hide table columns. This has the advantage of giving
the user visual feedback of what columns are hidden and of offering the
user an interface which is familiar from other pages.

This patch also moves CSS from a batch-operations-specific
CSS file into the main CSS file. Batch modification templates have been
modified accordingly.

To test, view the budget planning page and choose different
"plan by" options (by month, by library, by item type). Test
the show/hide action on each individual column and using the
"show all" and "hide all" checkboxes.

Signed-off-by: David Cook <dcook@prosentient.com.au>

Works as described.

This interface is also much more visually appealing, user-friendly, and informative than it was when it used the YUI menu.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:56:49 -04:00
Jared Camins-Esakov 1d1cd09456 Merge branch 'bug_9818' into 3.14-master 2013-04-25 21:53:43 -04:00
Katrin Fischer 44a8ed7dec Bug 9818: Fixing capitalization and remove dollar sign
Overdue Fines Cap ($) > Overdue fines cap (amount)

To test:
Go to administration > circulation and fine rules
Check column label Overdue fines cap now follows capitalization rules
and has no dollar sign.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:53:40 -04:00
Jared Camins-Esakov 4b1749c170 Merge branch 'bug_9850' into 3.14-master 2013-04-25 21:49:41 -04:00
Jared Camins-Esakov 68e8f724c0 Bug 9850: Fix Patron statistics link
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:49:15 -04:00
Jared Camins-Esakov 38421614a4 Bug 9850: Fix patron routing lists link
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:48:03 -04:00
Jared Camins-Esakov 80488c7bcf Bug 9850: Fix patron files link
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:47:14 -04:00
Nicole C. Engard 8b574a02ba Bug 9850: Update Lists Help
This updates the manual link in the lists help file.

To test:

Visit lists pages in the staff client, view the help and confirm link goes
to the right place.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:45:20 -04:00
Nicole C. Engard 3bac3ffd32 Bug 9850: Update holds help file
This updates the manual link on the holds help file.

To test:

Visit the holds tab on any bib record and click the Help link. Make sure it
goes to the right place.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:45:19 -04:00
Nicole C. Engard f2071b351e Bug 9850: Add missing tags help file
This patch adds a help file to the listing of titles that use a tag in the
tag moderation tool.

To test:

* Visit the Tag Moderation Tool
* Click on a accepted tag
* Check that the help file loads on the list and that the text and
links are right.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:45:19 -04:00
Nicole C. Engard 595ac425b8 Bug 9850: Update Tags & Comments Help
This patch updates the text and links for the Tag and Comment
moderation tools.

To test:

Visit the help on the tags and comments tools and confirm that text and
links are right.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:45:19 -04:00
Nicole C. Engard e6ebc86a07 Bug 9850: Catalogue help files
This patch updates the help files in the catalogue folder.

To test:

Visit the help on the search, detail pages, item details and
item history pages and confirm text and links are right.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:45:19 -04:00
Nicole C. Engard 3cac78bdb8 Bug 9850: Acq Help Files for 3.12
This patch updates the manual links and some text in the acq
help files.

To test:

Visit help on all acq pages and make sure links and text are right.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:45:19 -04:00
Nicole C. Engard a7cfa33058 Bug 9850: Update Admin Help Files for 3.12
This patch updates the links to the manual and the text of the
admin help files.

To test:

Visit the help files on all admin pages and make sure the links and text
are right.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:45:18 -04:00
Nicole C. Engard c4629aaffe Bug 9850: Update Patron Help Files for 3.12
This patch updates all the help files in the members folder. It also
adds a missing help file for approving patron account changes.

To Test:

Visit the help on every patron page and make sure the text and
manual links are all right.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed 2 obvious typos mentioned on the bug report.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:45:18 -04:00
Nicole C. Engard 50c46f52c2 Bug 9850: Update Patron Card Help Files
This patch updates the links to the manual in the patron card
creator help files. There were no other changes.

To test:

Visit help on the patron card creator tool and make sure the links are right.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:45:18 -04:00
Nicole C. Engard 418d5706a1 Bug 9850: Update Label Help Files
This patch updates the manual links in the label creator
help files. There were not other string changes.

To test:

Visit the help on the label creator and make sure that the
links go to the 3.12 manual.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Updating links.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:45:18 -04:00
Nicole C. Engard bec43ed640 Bug 9850: Update Authority Help Files
This patch just updates the links to the manual in the
Authority help files.

To Test:

Visit the help on all authority pages and click the manual link
in the help pop up. It should go to the 3.12 manual.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Updating links to new version.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:45:17 -04:00
Nicole C. Engard d45cd0f8b0 Bug 9850: Update Stray Help Files
This patch updates the help files which do not have a module
folder.

To test:

Visit About Koha, Koha Home, and the No Help Found pages and
check links to the manual.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Updating links to new version.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:45:17 -04:00
Jared Camins-Esakov dbb7a1e08a Merge branch 'bug_9925' into 3.14-master 2013-04-25 21:33:37 -04:00
Owen Leonard aadcdf7c7e Bug 9925 - Remove unused table-pager include
While the tablesorter plugin has not been completely eliminated from the
staff client yet, there are no more instances where it requires the
include file for showing paging controls. table-pager.inc can be safely
removed.

To test, apply the patch and confirm that the file is gone. A search of
Koha templates for references to table-pager.inc should return no
results.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:30:26 -04:00
Jared Camins-Esakov 7d5c915e3c Merge branch 'bug_10050' into 3.14-master 2013-04-25 21:22:16 -04:00
Katrin Fischer d8d4d9973f Bug 10050: Update German web installer files for 3.12 - Language settings
Activate German and English for OPAC and intranet by default.

To test:
- Run the German web installer
- Check that when logging into Koha the German interface is shown
  and you can switch between English and German using the links
  at the bottom of the page
- Check language relevant settings in the system preferences
  are correctly set

Note: The German po files in master are buggy, please
use files from translate.koha-community.org for testing.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:22:12 -04:00
Katrin Fischer 60db9a9e24 Bug 10050: Update German web installer files for 3.12 - Optional
This patch updates the German web installer files from the
optional directory.

This includes:
- Adding the bridge/reference.gif to the REF itemtype
- Updating currency rates and setting EUR to active
- Adding branchcode MPL to the sample holidays
- Updating a few strings on the patroncard samples
- Fixing typos and rephrasing

To test:
- Run the web installer with German installed
- Verify all optional SQL files are installed correctly

Note: The German po files in master are buggy, please
use files from translate.koha-community.org for testing.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:22:12 -04:00
Katrin Fischer 40cd834c74 Bug 10050: Update German web installer files for 3.12 - Mandatory
This patch updates the German web installer files from the
mandatory directory.

This includes:
- CalendarFirstDayOfWeek defaults to Monday
- gist rates default to 0.07|0.19|0.00
- RoutlingListNote default text translation
- uniqueitemfields default set to barcode stocknumber
- Translation of new user flags and permissions
- Corrections to existing translations and typo corrections

To test:
- Run the web installer with German installed
- Verify all mandatory SQL files are installed correctly

Note: The German po files in master are buggy, please
use files from translate.koha-community.org for testing.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:22:12 -04:00
Jared Camins-Esakov 21786fb71e Merge branch 'bug_10070' into 3.14-master 2013-04-25 20:35:25 -04:00
Jonathan Druart 52db043347 Bug 10070: Anonymous search history is not being set in the cookie
Test plan:
1 - turn on EnableOpacSearchHistory
2 - launch some searches at the opac
3 - go to your search history
4 - there is no history!
5 - apply this patch
6 - retry steps 1 to 3
7 - your history search is available!

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

This does fix the bug, but does undo the change to make the cookie
utf-8 safe, however I think that change was done in the wrong way so
I am happy to sign this off

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Wondering if the comment line should be deleted now too.
Patch fixes the problem.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 20:35:21 -04:00
Jared Camins-Esakov f5709c0098 Merge branch 'bug_9804' into 3.14-master 2013-04-24 09:16:20 -04:00
Magnus Enger 6e4851fa40 Bug 9804 - Fix name for NORMARC biblio-koha-indexdefs.xml
When i did bug 8805, I gave the biblio-koha-indexdefs.xml file the
wrong name, and called it biblio-zebra-indexdefs.xml. This patch
fixes that.

To reproduce:
- Check that etc/zebradb/marc_defs/normarc/biblios/biblio-zebra-
  indexdefs.xml exists

To test:
- Apply the patch and check that etc/zebradb/marc_defs/normarc/
  biblios/biblio-zebra-indexdefs.xml no longer exists, but that
  etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml
  does exist.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-24 09:16:17 -04:00
Jared Camins-Esakov 54abf192f8 Merge branch 'bug_9903' into 3.14-master 2013-04-24 09:11:22 -04:00
Jonathan Druart a8eb99b8ff Bug 9903: Followup: use the KohaDates T::T plugin to display dates.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-24 09:11:19 -04:00
Owen Leonard 0c76032738 Bug 9903 - Sort by date broken on patron detail page
When the patron detail page switched to DataTables no accommodation was
made for metric date formats in sorting.

This patch adds sorting based on data in a span's title attribute, and
thus requires that the patch for Bug 9887 be applied.

To test, view the detail page for a patron who has assorted checkouts,
relatives' checkouts, and holds. Sorting of date columns should be
correct with the dateformat preference set to any value.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Nice improvement.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-24 09:11:19 -04:00
Jared Camins-Esakov c396d731ec Merge branch 'bug_10023' into 3.14-master 2013-04-24 08:57:42 -04:00
Jared Camins-Esakov 2cc3334a5c Bug 10023 follow-up: Remove the last occurrences of N[degree sign] 2013-04-24 08:56:33 -04:00
Katrin Fischer 7d3d347774 Bug 10023: Change degree notation for number to No.
This patch changes N<little circle> to No. in three templates.

To test:
1) Search for a vendor with visible baskets.
   Check that the first column of the basket table in the
   is now labelled No.

2) Print a PDF order in acquisitons with layout2pages.

3) Print a PDF oder in acquisitons with layout3pages.

Check both generated PDFs for the correct syntax.

Note: you need to switch the system preference
OrderPdfFormat in order to test 2) and 3).
The 2 possible settings are:
pdfformat::layout3pages
pdfformat::layout2pages

It's not only Koha - git bz doesn't like the degree
notation either.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

I prefer "No." over "#" and my survey of the templates shows that "No."
appears more often. Looks like something to add to our style guide.
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-24 08:56:15 -04:00
Katrin Fischer 3b45b745cf Bug 10023: Change degree notation for number to #
This patch changes N<little circle> to # in three templates.

To test:
1) Search for a vendor with visible baskets.
   Check that the first column of the basket table in the
   is now labelled #

2) Print a PDF order in acquisitons with layout2pages.

3) Print a PDF oder in acquisitons with layout3pages.

Check both generated PDFs for the correct syntax.

Note: you need to switch the system preference
OrderPdfFormat in order to test 2) and 3).
The 2 possible settings are:
pdfformat::layout3pages
pdfformat::layout2pages

It's not only Koha - git bz doesn't like the degree
notation either.
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-24 08:56:15 -04:00
Jared Camins-Esakov 06b887630b Merge branch 'bug_9358' into 3.14-master 2013-04-23 09:04:19 -04:00
Bernardo Gonzalez Kriegel cb47df4bbb Bug 9358 - Followup - Fixed field plugins for MARC21 should be updated for MARC21 update #15
This little patch adds a few values and descriptions to complete
value builder for marc21 008.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Follow-up works as described.
XML change only.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-23 09:04:15 -04:00
Bernardo Gonzalez Kriegel 67dae3abd4 Bug 9358 - Fixed field plugins for MARC21 should be updated for MARC21 update #15
This patch, together with 9357, fix plugins for leader, 006, 007 and 008 MARC21 fields

Leader18 c and i is fixed on Bug 9357

Added missing/renamed fields on 007

Options 'o' and 'q' already present on 006 and 008,
fixing spaces and removing unnecessary descriptions.

To test:
1) Catalog/edit a record
2) On 007 value builder, check missing values
   on 008, BKS, check for example 33- Literary form,
   i- Letters has a description
3) Apply the patch
4) Clean your browser cache
5) On 007 value builder, new values are present
   On 008/6 descriptions are absent

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-23 09:04:15 -04:00
Jared Camins-Esakov 061b38fe84 Merge branch 'bug_10026' into 3.14-master 2013-04-23 08:44:07 -04:00
Owen Leonard 9186c2feda Bug 10026 - OPAC cart not showing location anymore
When Bug 7570 added availability information to the cart it switched
which subroutine was used to get item information, and thus changed how
the information was being returned.

This patch makes accommodations for this change by adding processing of
item location information to the script in a way that will match the
existing template variables.

To test, add items to the cart in the OPAC some of which include
shelving location information. When you view the cart you should see the
shelving location displayed.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-23 08:43:50 -04:00