Commit graph

17529 commits

Author SHA1 Message Date
Jared Camins-Esakov
eb27e4084d Merge branch 'bug_7358' into 3.12-master 2012-11-25 18:20:32 -05:00
Jonathan Druart
d57194e24d Bug 7358: reaffect a closed basket to a closed basketgroup
The list of basketgroups when looking at a closed basket show all the
basketgroups.
It should not be possible to affect a basket to a closed basketgroup,
since this basketgroup should have been sent to a supplier.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:19:29 -05:00
Jared Camins-Esakov
de84bd9e46 Merge branch 'bug_9073' into 3.12-master 2012-11-25 18:09:14 -05:00
3a7488f874 Bug 9073 - Download option from the cart should match the menu button in lists
This patch moves the staff client Cart download choices into a toolbar
menu button instead of requiring that the user make the choice via a form
in the pop-up window.

To test, add items to Cart in the staff client. Open the cart and
choose a download option from the Download menu. Your download
should complete correctly without the page changing or reloading.

Unrelated edit: Eliminating duplicate document.ready() block by
consolidating a couple of lines of JavaScript.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked all export formats can be selected and downloaded, including
CSV profiles.
All tests and perlcritic pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:08:46 -05:00
3247c1774f Bug 9115 - basket window should close automatically when placing a hold
If you choose to place a hold from the Cart pop-up, the entire
holds process (possibly including login) takes place in the cart
window. Upon completion of the operation you're left with a second
window which has lost its context as the Cart.

This patch revises the hold process so that when you click the
hold link in the cart the operation is moved to the main window
and the Cart window closes.

Since the holdSel() function doesn't require interaction with
template variables I have moved it to basket.js along with the
described changes.

To test, put items in your Cart and open it. Select items to
place on hold and click the "Place hold" link. The cart
should close, and the items you selected should appear on the
place hold screen in the main window.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked in Firefox and Chromium in Ubuntu, works nicely.
All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:06:11 -05:00
Jared Camins-Esakov
f13b13dc16 Merge branch 'bug_8660' into 3.12-master 2012-11-23 16:39:37 -05:00
Fridolyn SOMERS
dd5ce614aa Bug 8660: follow-up: Porting changes to ccsr theme
Signed-off-by: Mason James <mtj@kohaaloha.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 16:39:13 -05:00
Fridolyn SOMERS
02755f6c55 Bug 8660: Tag status does not show on multiple tag add
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 16:38:32 -05:00
Jared Camins-Esakov
986a18c82b Merge branch 'bug_8986' into 3.12-master 2012-11-23 13:35:24 -05:00
Jonathan Druart
2b5000c7d4 Bug 8986: Followup FIX a JS error if there is no valid card number
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

I can't reproduce the JS error but the template changes are correct
with regard to how the page should handle errors.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 13:35:03 -05:00
a6c0175967 Bug 8986: Batch patron modification template corrections
Many minor template changes:

- Correcting title and headings
- Adding translation to string in JavaScript
- Tweaking table sorter
- Wrapping card number in link to patron detail page
- Adding standard styles to "clear" links (see patron attributes)
- Terminiology corrections (borrower-> patron, cardnumber -> card number)
- Capitalization corrections
- Improve display of extended attributes

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 13:34:05 -05:00
Jared Camins-Esakov
83da56662d Merge branch 'bug_8899' into 3.12-master 2012-11-23 13:30:32 -05:00
cb535ea6f7 Bug 8899 [Revised] Remove unused CSS declarations from staff client CSS
Using an add-on for Firefox called CSS Usage I found some
instances of CSS in staff-global.css which are unused. Unused
selectors were confirmed by a search of the code.

Testers can't exactly check the whole staff client for things
which look off, but can confirm by their own search that
the removed CSS has no corresponding markup.

Revision adds back lines which were discoverd by QA to be in use.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 13:30:14 -05:00
4e97465463 Bug 5521 - item edit form appears if no items found
This patch changes the template so that if no items are
found the page doesn't show "The following barcodes were found"
and doesn't show the item edit form.

To test, submit a batch which contains no valid barcodes.
Compare to a batch which contains some or all valid barcodes.

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

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 13:06:04 -05:00
Jared Camins-Esakov
560e2d7f67 Merge branch 'bug_8546' into 3.12-master 2012-11-23 13:02:31 -05:00
8c1aa96d02 Bug 8546 - Error in description of OPAC Advanced Search Publication date range search
The publication date range search description in the OPAC suggests
that a search like "-1987" or "2008-" is not inclusive when it
actually is. This patch corrects the description.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 13:01:29 -05:00
Fridolyn SOMERS
19ce907384 Bug 8983: Typo in UNIMARCslim2OPACResults.xsl
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 12:59:04 -05:00
c5e91b8060 Bug 8163: Click to populate XSLT preferences with "default" or empty values
This patch adds markup and JavaScript to the system preferences
interface so that the user can click "default" or "empty" to populate
an XSLT-related pref with those vaules.

To test, open system preferences for the OPAC or staff client. In
the description for an XSLT-related preference click the "default"
link to populate the field with "default." Click the "leave empty"
link to empty the field.

Revised according to Julian Maurice's suggestion for a more
generic, flexible way to implement it.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 12:28:02 -05:00
Jared Camins-Esakov
48ce46e8fb Merge branch 'bug_8664' into 3.12-master 2012-11-23 12:12:59 -05:00
4fbadbaed4 Bug 8664 - Add floating toolbar with save button to system preferences editor
This patch adds a copy of the "save" button in a toolbar at
the top of the system preferences editor. The toolbar becomes
fixed at the top of the page when you scroll down, exactly like
the toolbar on addbiblio.pl.

Because multiple save buttons might appear when the system prefs
page displays search results, the toolbar does not appear in
this case.

To test, open the system preferences editor and change a setting.
Try saving both with the button in the toolbar and the button at
the top of the page. Test scrolling to confirm that the toolbar
"sticks" to the top of the page when you scroll down.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 12:12:37 -05:00
Jared Camins-Esakov
2512581533 Merge branch 'bug_8758' into 3.12-master 2012-11-23 11:44:55 -05:00
Jared Camins-Esakov
ea418af205 Merge branch 'bug_2832' into 3.12-master
Conflicts:
	kohaversion.pl

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 11:44:26 -05:00
Jared Camins-Esakov
2c65bdcdcc Update kohaversion for 3.11.000.001 2012-11-23 11:42:34 -05:00
Jared Camins-Esakov
e93cc44941 Merge branch 'bug_2832' into 3.12-master
Conflicts:
	installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
	installer/data/mysql/updatedatabase.pl

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 11:41:48 -05:00
Jared Camins-Esakov
6a265eb793 Merge branch 'bug_9008' into 3.12-master 2012-11-23 11:40:46 -05:00
Jared Camins-Esakov
8445934612 Update history to reflect 3.10.0 and 3.8.7 releases
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 11:38:56 -05:00
Paul Poulain
7703dd6ce3 Adding 3.10 release notes 2012-11-23 11:34:33 -05:00
Paul Poulain
9a0e4911e6 Bumping version to 3.10.0 and adding sponsors that are were not already written
Sponsored-by: Central Kansas Library System (CKLS), Plum Creek Library System and Washoe County Library System
Sponsored-by: Los Gatos Public Library and Harrison Carmel Public Library
Sponsored-by: Talking Tech
Sponsored-by: VOKAL
Sponsored-by: Brooklyn Law School Library
Sponsored-by: North Central Regional Library (NCRL)
Sponsored-by: Washoe County Library System
Sponsored-by: Corpus Christi Public Libraries
Sponsored-by: Northeast Kansas Library System (NEKLS)
Sponsored-by: Université d'Aix-Marseille
Sponsored-by: Université de Rennes 2
Sponsored-by: Université de Lyon 3
Sponsored-by: Université de St Etienne
Sponsored-by: BdP de la Meuse
2012-11-23 11:34:23 -05:00
Paul Poulain
ab159bd8a2 Bug 9122: fix the problem when writing-off a fine
The problem was introduced by the addition of accountlines_id in bug 7671

The WriteOffFee sub was called with accountlines_id as second parameter
but still dealing with the accountno column.

As a result, the UPDATE was failing (updating nothing), and the fine
note written off even if the writeoff itself was saved. In other words:
the writeoff was not "attached" to the fine.

This patch fixes the problem.

Test plan: do what katrin says in initial description of the problem:
- add some fines manually, I did 'new card' and sundry
- try writing off all of them or one of them
- the fine is correctly written off

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 09:09:53 -05:00
91a88e6f00 Bug 9106 - Filtering list of uncertain price list by owner empties order information
The form which filters the list of orders with uncertain prices
includes a parameter which tells the script to modify the orders,
resulting in order information being lost. This patch removes
the unnecessary form field.

To test you must have orders with uncertain prices, preferably from
more than one user. Go to the uncertain prices page. Before applying
this patch, submitting the "orders from" form would cause the page
to refresh with no results. This is because the script cleared the
orders of price, quantity, etc. information.

After applying this patch the uncertain prices list should refresh
and show the correct results, either your orders ("me") or all
("Everyone").

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-22 09:40:36 -05:00
afc860d66b Bug 9078 - fixing exceptions broke tests
Fixing the holiday exceptions arised a problem with how the test data was constructed.
This made several tests fail.

This patch fixes the add_holiday function. Tests should pass now.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-22 09:27:46 -05:00
8615996749 Bug 9078 - is_holiday should honour holiday exceptions
Make is_holiday return 0 for holiday exceptions.

Note: This patch makes several current ok tests fail. My first guess is test data is not
constructed ok. More on this later.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-22 09:27:21 -05:00
Jared Camins-Esakov
f7fabc661c Merge branch 'bug_8800' into 3.12-master 2012-11-22 09:20:07 -05:00
7b18e2146c Bug 8800 - useDaysMode=Datedue wrong behaviour (revisited)
useDaysMode=Datedue wasn't used as advertised in the docs. Added
next_open_day and prev_open_day subs to Koha::Calendar and some tests for them.

- Koha::Calendar->addDate was rewritten in a more sane way (also split into
  addHours and addDays for convenience).
- Fixed a bug introduced in Bug 8966 regarding dt truncation and dtSets->contains
- Minor docs typos
- Use the passed Calendar mode or default to 'Calendar' in Koha::Calendar->_mockinit.
- Tests

I'm writing some db-dependent tests for is_holiday, and hopefully for CalcDateDue so any
rewrite/followup doesn't break things.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-22 09:11:19 -05:00
Jared Camins-Esakov
64b9bc74bf Bug 9064: Increment version number
Database update for bug 9064 has been given version 3.09.00.067
2012-11-22 09:04:05 -05:00
Paul Poulain
b5474b7f95 Bug 9064: fix statistics.ccode column
From updatedatabase.pl:
    $dbh->do("ALTER TABLE statistics ADD COLUMN ccode VARCHAR ( 10 ) NULL AFTER associatedborrower");
From kohastructure.sql:
  `ccode` int(11) default NULL, -- foreign key from the items table, links transaction to a specific collection code

The variant in updatedatabase.pl is probably what was wanted.

This patch fixes the kohastructure and add another updatedatabase.pl, in case someone has a broken install.
This should not happen, because 3.10.0 still not released, but just in case...

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-22 09:01:30 -05:00
Jared Camins-Esakov
be19f11e97 Merge branch 'bug_8954' into 3.12-master 2012-11-20 14:40:15 -05:00
Mathieu Saby
8718629c5c Bug 8954: Make languages list in advanced search translatable (revision 1)
In opac-search.pl and search.pl, this patch moves the $lang variable from the end to the begining of the script, and use it as a parameter for getAllLanguages.
In Languages.pm, getAllLanguages function is modified :
- if no parameter is passed to the function, it returns english languages names
- if a $lang parameter conforming to RFC4646 syntax is passed :
-- the function returns languages names translated in $lang if possible
-- if a language name is not translated in $lang in database, the function returns english language name
To test, set your opac and staff interface in english and in other languages and check search.pl and opac-search.pl :
- If language names in your languages_description table are translated in the same language you use for your GUI, the language names in dropdown list will be translated in this language (+native name).
- If your GUI is in english, or in a language into whitch languages names are not translated in languages_description, the dropdown list will stay in english (+native name).

Signed-off-by: Marc Veron <veron@veron.ch>

Patch behaves as expected.

With Opac language set to French I got all languages with French language name.
With German (de-DE), I got only a few with German language names (and all other with English ones),
this was due to missing entries for de-DE in table language_descriptions.
This behaviour is consistent with the description above.

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

Tested language list in OPAC and staff advanced search is translated
properly after applying the patch. Checked that language switcher still
works like it should.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fixed typo in POD.
2012-11-20 14:39:56 -05:00
Jared Camins-Esakov
c11b8c144d Merge branch 'bug_8844' into 3.12-master 2012-11-20 14:24:46 -05:00
Jared Camins-Esakov
c085b9eb91 Merge branch 'bug_9024' into 3.12-master 2012-11-20 14:14:15 -05:00
Mirko Tietgen
f5703f8bc7 Bug 9024: Fix typo
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 14:14:09 -05:00
Katrin Fischer
a0819d9baa Bug 9024: Add missing sample data to existing files
Adds missing authorised values (enhancement)

Adds missing slip notice templates (bug fix)
Koha will complain if you try to print a slip and there is no notice
defined for them, so this is not really an improvement, but kind of a bug fix.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 14:14:09 -05:00
Katrin Fischer
27e2f67898 Bug 9024: Adding sample patron attributes to German web installer
Adds SHOW_BCODE as sample patron attribute to the German web installer.

To test:
- Run the web installer in German, make sure the new sample data shows up
and can be installed.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 14:13:46 -05:00
Jared Camins-Esakov
86dfc69e8e Merge branch 'bug_9017' into 3.12-master 2012-11-20 14:10:59 -05:00
Marc Veron
abf72944dd Bug 9017 - Quote of the day: Table footer not translated
The strings for the table footer of the QOD feature are translated in /datatables-strings.inc, but they did not show up in staff client due to missing code in quotes.tt -> $(document).ready(function(), part "oLanguage"
Code added as appropriate.
See: http://datatables.net/usage/i18n

Additionally, quotes.tt had a stray </script> tag after [% INCLUDE 'datatables-strings.inc' %]

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 14:10:19 -05:00
Jared Camins-Esakov
af02e22ce5 Bug 9070: [SIGNED-OFF] authority searches in auth_finder error out
When using authority records imported into Koha from elsewhere, you
can get an error like:
    Can't use string ("HASH(0xbc6c{30)") as a HASH ref while "strict refs" in use at /usr/share/koha/lib/C4/AuthoritiesMarc.pm line 363.
in authorities/auth_finder.pl. This patch fixes that error.

To test:
1) You will need records imported from elsewhere.
2) Use the authority control plugin in a bib record to search for one of
   those headings.
3) Observe you get a nasty error.
4) Apply patch.
5) Repeat step 2.
6) Observe the error is gone.
7) Sign off.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised. No warning about "defined(%hash) is deprecated"
under perl v5.10.1.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 14:09:02 -05:00
29d1aa1be0 Bug 8971 - Sort holds queue report using DataTables
Replacing the old tablesorter plugin with DataTables on
this page will fix sorting bugs related to whitespace and
markup in table cells which tablesorter couldn't handle.

I have also taken the liberty of changing the default sort
from patron to call number, assuming that the librarian
uses this list to pull items from the shelf, and the shelf
is organized by call number.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 08:10:51 -05:00
Jared Camins-Esakov
8ae00e638b Merge branch 'bug_9023' into 3.12-master 2012-11-20 08:05:28 -05:00
Katrin Fischer
9e5fe6df1e Bug 9023: Update installer text files
Corrected some information about the provided sample data and corrected
text files to obey capitalization rules.

To test:
I suggest taking a look at the patch file and also taking a look at the
English web installer, checking if it works, if there are typos or wrong
information.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 08:05:04 -05:00
Katrin Fischer
990adad284 Bug 9023: Remove NY Z39.50 servers from installer txt files
Broken Z39.50 targets were removed with patch for bug 3782, but are still
mentioned in the text files.

This patch corrects that mistake.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 08:04:06 -05:00