Commit graph

17970 commits

Author SHA1 Message Date
Fridolyn SOMERS
ec6dd32bde Bug 9147: OPAC hidden fields are not hidden in ISBD view
When in framework a subfield has a number > 0 in hidden, it his hidden in MARCview.
It should be hidden also in ISBD view.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Does what it says, hides hidden fields on the OPAC

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

To test:
1) Hide 245$b or another field from ISBD view in your MARC
   framework by assigning a hidden value greater 0
2) Check the different views in OPAC, the field should be hidden now from
  - Labelled MARC view (as it was before this patch)
  - ISBD view
   It will still show up for plain MARC and XSLT views.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 21:12:29 -05:00
Jared Camins-Esakov
54af338d97 Merge branch 'bug_9376' into 3.12-master 2013-01-17 21:08:59 -05:00
Galen Charlton
c7629376fc Bug 9376: extend HTML fix to moremember-brief.tt
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 21:08:48 -05:00
Vitor FERNANDES
7be86cd481 Bug 9376: Problem with dateexpiry display in moremember.tt
There is a problem that brokens the interface of moremmeber when
displaying the date expiry when renewing a patron.
In the first comment I said that the line that causes the error
should be:

<span class="reregitryinfo">[% dateexpiry %]</span>

but the correct way should be:

<strong class="reregitryinfo">[% dateexpiry %]</strong>

This way the date expiry after renew a patron appears in bold.

Test plan:

- before applying the patch try to renew a patron and check
  that almost everything went bold
- apply the patch
- renew a patron and only the expiration date is bolder.
- Note that the bug doesn't manifest in master because
  the patch for bug 6261 causes the invalid HTML to never
  be reached; it *does* affect 3.10.x and earlier.

Sponsored-by: KEEP SOLUTIONS
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 21:08:48 -05:00
Jared Camins-Esakov
43a40008e3 Merge branch 'bug_9229' into 3.12-master 2013-01-17 21:02:58 -05:00
67be30c822 Bug 9229 - branch code instead of name in subscription-detail.pl
This patch corrects the problem by using the KohaBranchName plugin.

Test plan:
Go in a subscription detail page.
Check that the "Library" information is changed from the branchcode to
the branchname

Signed-off-by: Fridolyn SOMERS <fridolyn.somers@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 21:00:47 -05:00
Jared Camins-Esakov
76a279ae68 Merge branch 'bug_9398' into 3.12-master 2013-01-17 20:58:23 -05:00
Corey Fuimaono
64a6f9a977 Bug 9398 - [ ? ] Link Lacks Context for All General Users (Accessibility) [Contexual Help]
testing procedure:
1. see that [ ? ] has simply been changed to 'Help'

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
I like this change, the context is improved even for sighted individuals, and it helps screen reader users a great deal.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
The new 'Help' doesn't take up a lot more space than the old '[ ? ]'
and makes it easier to undertand what will happen when you click on it.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 20:58:17 -05:00
Jared Camins-Esakov
02c7bec65c Merge branch 'bug_8401' into 3.12-master 2013-01-17 20:55:47 -05:00
Jared Camins-Esakov
8bfba2d98f Add Fred Pierre to history
Welcome, Fred Pierre! You are the 201st committer to Koha.
2013-01-17 20:55:20 -05:00
Fred Pierre
09ec1bef38 Bug 8401 : Highlighting of search terms in preference causes loss of data
To test:

1/ Go to system preferences
2/ Go to SCOUserCSS
3/ Add #self
4/ Search for self
5/ Open SCOUserCSS
6/ Note it now contains only # (Do not click save)
7/ Apply the patch
8/ Refresh the page, and check SCOUserCSS and note it now says #self
9/ Rejoice!

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely and passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 20:53:40 -05:00
Jared Camins-Esakov
9da3b4b099 Merge branch 'bug_9413' into 3.12-master 2013-01-17 20:49:10 -05:00
Galen Charlton
a87817d7d6 Bug 9413: fix sample notice SQL for en
Fix two different errors that prevented sample notices
from being loaded into a fresh English Koha database.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Hugh Davenport <hugh@davenport.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
English sample_notices.sql installs correctly after this
patch is applied. Web installer completes without any errors.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 20:48:55 -05:00
Jared Camins-Esakov
0dbaf41574 Merge branch 'bug_9179' into 3.12-master 2013-01-17 18:31:03 -05:00
Jared Camins-Esakov
e6ea3db830 Add Corey Fuimaono to history
Welcome, Corey Fuimaono! You are the 200th developer to have a patch
committed to Koha.
2013-01-17 18:30:25 -05:00
Corey Fuimaono
a3cb99841e Bug 9179 - Incorrect capitalization in serials-collection.pl
testing procedure:
1. Make Subscription for Valid/Test Item
2. Look at Serial Collection Information and catagorize Item as "Arrived"
3. Click "Generate next". Observe Capitalization is Correct.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes capitalization for 'Generate next' button.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 18:27:52 -05:00
Jared Camins-Esakov
5e1562c699 Merge branch 'bug_9062' into 3.12-master 2013-01-17 18:24:03 -05:00
Jared Camins-Esakov
0043240b4b Add Hugh Davenport to history
Welcome, Hugh Davenport! You are the 199th developer to have a patch committed
to Koha.
2013-01-17 18:23:19 -05:00
Hugh Davenport
2eca979109 Bug 9062 Fix spacing next to tax rate
On the supplier view screen, there was a space after the discount
and before the % sign, but there was none for the tax rate.

This patch adds in a patch, so they look similar.

Signed-off-by: Hugh Davenport <hugh@davenport.net.nz>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tiny follow-up, fixes spacing.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 18:18:15 -05:00
Hugh Davenport
55cf86e230 Bug 9062 Fix format for discount rate for vendors
On the vendor display and edit screens, the tax rate information was
formatted to 1 decimal point, while the discount rate was not.

This patch adds a format string to the discount information so that
it is formatted in the same way.

Signed-off-by: Hugh Davenport <hugh@davenport.net.nz>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Makes display on vendor detail page more consistent and
passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 18:18:14 -05:00
Jared Camins-Esakov
5167c32060 Merge branch 'bug_8443' into 3.12-master 2013-01-15 22:11:16 -05:00
Fridolyn SOMERS
bc71428571 Bug 8443: Suggestions publication year and copyright date (follow-up 2) Cosmetic changes and perltidy formatting
Cosmetic patch :

Manual editions :
- use of () for qw
- use of q{} or qq{} in SQL queries
- replacing $${key} by $->{key}
- formatting SQL queries (easier to read)
- in suggestion.tt reducing date input size to allow calendar icon on same line

+ Formatting with perltidy

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests were done with all 3 patches from this bug applied:

1) Add suggestion from OPAC, check copyright date is saved
2) Add suggestion in intranet, check copyright date is saved
3) Edit suggestion, check change is saved correctly
4) Check date filters work as expected, using single dates, date ranges
   and multiple filters at once:
  - Accepted on
  - Managed on
  - Suggested on
5) Check copyright date search works correctly.

Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-15 22:10:59 -05:00
Fridolyn SOMERS
13bebe6b34 Bug 8443: Suggestions publication year and copyright date (follow-up 1) Comments corrections
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-01-15 22:10:59 -05:00
Fridolyn SOMERS
7ca9093f03 Bug 8443: Suggestions publication year and copyright date
Main patch correcting suggestions search :
- allow filtering on copyrightdate, manageddate and accepteddate
- entered dates remains in filter during search
- empty and null values are in the same tab
- null/empty values are not present in filers comboboxes

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-01-15 22:10:59 -05:00
Jared Camins-Esakov
aca672839c Merge branch 'bug_9309' into 3.12-master 2013-01-15 22:02:22 -05:00
Robin Sheat
71c85a20ba Bug 9309 - Make OPACurlOpenInNewWindow be respected for 856$u
If a biblio record contained a URL, and the OPAC was using the "normal"
(non-XSLT) display for records, then these links would never open a new
window. With this patch, they will.

Test plan:
1) have a biblio containing an 856$u link
2) set OPACurlOpenInNewWindow to "true"
3) do not use XSLT for displaying the detail pages in the OPAC
4) view the record, click the link, and note that it opens in the
   current window.
5) apply the patch
6) reload the detail page, click the link, and note that it opens a new
   window.

Sponsored-By: National Institute of Water and Atmospheric Research
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-01-15 22:02:15 -05:00
Jared Camins-Esakov
518ddc59d0 Merge branch 'bug_9306' into 3.12-master 2013-01-15 21:55:01 -05:00
Nicole C. Engard
be356e1a07 Bug 9306: Update descriptions for the 4 SeparateHoldings prefs
Patch updates the text of the SeparateHoldings and OpacSeparateHoldings
preference descriptions to be more readable.

To test, apply the patch and check the text of the preferences.

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

Description and test plan added.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-15 21:54:26 -05:00
Jared Camins-Esakov
f0adcc8073 Merge branch 'bug_7657' into 3.12-master 2013-01-15 21:52:04 -05:00
9e332f95ab Bug 7657 - Google and OpenLibrary image conflict
The JavaScript files which output Google and OpenLibrary cover images
each assumes it is the only source for cover images running. Each script
isn't specific enough to filter out markup generated by the other. This
patch corrects the specificity of the selector looking for markup
related to Google and OpenLibrary covers.

To test, enable both Google and OpenLibrary cover images in the OPAC.
Perform a search which will return results which include titles which
have covers from both services. Confirm that these covers appear
correctly and that "no cover" information still works correctly.

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>
Added corrected Javascript to CCSR theme.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-15 21:51:51 -05:00
Jared Camins-Esakov
20a8efcad8 Merge branch 'bug_8883' into 3.12-master 2013-01-15 20:05:02 -05:00
ee098df9b5 Bug 8883: 'opacsmallimage' doesn't work in ccsr theme
This patch makes it possible to customize the CCSR theme using the
opacsmallimage system preference. It also enables the LibraryName
preference for opacsmallimage alt text.

To test, set the opacsmallimage preference and switch to the CCSR
theme. Your custom image should appear. Set the LibraryName preference
and confirm that the alt attribute of the custom logo changes
accordingly.

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

This patch works correctly, although it lacked a description and test
plan, which I have added. I would have used IF instead of UNLESS because
to me that seems more readable, but it's not a deal-breaker.

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-01-15 20:04:45 -05:00
Jared Camins-Esakov
67a630e81f Merge branch 'bug_9215' into 3.12-master 2013-01-14 23:28:50 -05:00
67ad61070e Bug 9215 - non translatable string in manage-marc-import
Status information about staged MARC record batches was being pulled
directly from the import_batches table where they are stored as English
strings. This patch puts a check on the status value into the template
so that translatable strings can be embedded.

To test, apply the patch and view both the table of staged MARC record
batches and details about individual batches. In the default 'en'
translation you should see import statuses displayed with a capital
letter ("Staged"). This indicates that the status is now being pulled
from the template.

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-01-14 23:26:54 -05:00
Jared Camins-Esakov
e641902655 Merge branch 'bug_9182' into 3.12-master 2013-01-14 23:24:02 -05:00
Adrien Saurat
356bf14f4d Bug 9182: fix on sortable columns on Saved reports
When displaying the Saved reports, since 3.10 the number of columns is
higher but the datasorter parameters have not been changed accordingly.
It's thus impossible to sort on the author or the creation date, for
example.

TEST PLAN :
1) Check sortable columns before applying : some useful columns are not
sortable, while the last columns are sortable (but don't need to be).

2) Once the patch is applied, the "non sortable" columns are the correct
ones.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Colums for saved reports are all sortable correctly now.
All tests and qa script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 23:23:59 -05:00
Jared Camins-Esakov
6ba61ab3e0 Merge branch 'bug_7143' into 3.12-master 2013-01-14 23:22:17 -05:00
Chris Cormack
7e1a341d4e Bug 7143 updating history and about page
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Changes look to be correct

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 23:21:59 -05:00
Jared Camins-Esakov
594343bbd9 Merge branches '3.12-master' and 'bug_7143' into bug_7143 2013-01-14 23:21:29 -05:00
Jared Camins-Esakov
5ea98ade5d Merge branch 'bug_6574' into 3.12-master 2013-01-14 23:17:25 -05:00
Liz Rea
f13de4bdb6 Bug 6574 - js error in en-GB and en-NZ translations due to improper quoting
To replicate:

* install en-NZ translation (or en-GB)
* activate the new language, and select it for use
* pretend you are going to issue a book to a member (search for a member from "check out" in header)
* without the patch, the toolbar will be incorrect. The toolbar will also be incorrect on moremember.pl.

To test:
* apply the patch
* re-generate the en-NZ or en-GB translation
* activate the new language, or select it for use
* pretend you are going to issue a book to a member (search for a member from "check out" in header)
* with the patch, the toolbar will appear to be correct. It will also be correct on moremember.pl.

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-01-14 23:17:08 -05:00
Jared Camins-Esakov
b4e255e4d7 Merge branch 'bug_8557' into 3.12-master 2013-01-14 23:08:49 -05:00
Liz Rea
a1c9272e2f Bug 8557 - Unexpected behavior with scanners
This is an alternative to the original implementation - this one works in chrome as well as firefox.

To test:

1)
Set syspref 'AcqCreateItem' to 'Create Item when receiving an order.'

2)
Create a basket for a vendor, add an order line.

3)
Search for this vendor using Vendor search

4)
Receive Shipment for this vendor and choose the title you ordered in 2)

5) You will get the dialog to create related item(s)

6)
Fill in Item 0 through o (see screenshot)

7)
Scan Barcode for field p - Barcode

7)
Result: Scanner sends a [return], form closes and you had no chance to fill in fields t - z

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

Tested with Chrome Version 23.0.1271.97 m  and Firefox 17.0.1, both behave as expected.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with Firefox and Chromium in Ubuntu.

Additional test done:
1) Add a new subscription, choose 'receive adds items'
2) Receive an issue, fill out $p with a barcode
3) Make sure hitting enter in the barcode field does not send the form.

All tests pass and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 23:07:42 -05:00
Jared Camins-Esakov
80446e9c1d Merge branch 'bug_9126' into 3.12-master 2013-01-14 23:01:15 -05:00
Julian Maurice
3de2b44782 Bug 9126: Do not return from Check too early.
If there is no errors, it should continue instead of returning true.

+ move a block of code at the end of Check function. This avoid
detaching and re-attaching a HTML block if there are errors.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
The following queries show us the issues:
select count(*) from items;
select * from aqorders_items where ordernumber=XX;

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

AcqCreateItem = receive
UniqueItemFields = barcode

1) Create a new basket
2) Create a new order with quantity > 1
3) Close the basket and create a new invoice/shipment
4) Receive only 1 item.
   - Fill out the first item form with item type only. Click add.
   - Don't change second item form at all.
   - Click save.

Before patch:
2 items are created on the record, both with the selected itemtype.

After patch:
Only 1 item is created, which is correct.

Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Seems to work as described by the test plan
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 23:01:02 -05:00
Jared Camins-Esakov
22613e43cc Merge branch 'bug_9360' into 3.12-master 2013-01-14 22:53:01 -05:00
Liz Rea
4df6f43a66 bug 9360 - Clean borrowers tool wording and layout problematic
To test:

Verify that the text has been changed to "Batch patron deletion/anonymization in the following places:

* tools-home
* the page title
* the heading on cleanborrowers
* the menu on cleanborrowers

Verify that the tool still works as intended.

This (finally) fixes the things Owen pointed out.
changes check-out to checkout per Galen.

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Fix indentation and tabulations characters
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 22:51:55 -05:00
Jared Camins-Esakov
8f70edeb62 Merge branch 'bug_8433' into 3.12-master 2013-01-13 08:42:53 -05:00
Colin Campbell
7e7b3731dc Bug 8433 Remove unused 'use English'
Adding a use English to mosules which dont may
waste a few CPU cycles and bytes of storage
but doesnt add anything to the sum of human happiness

Remove unnecessary use English's
Removed already commented out but equally unnrcessary
use Exporter in same modules

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-01-13 08:42:50 -05:00
Jared Camins-Esakov
73d84bc362 Merge branch 'bug_9292' into 3.12-master 2013-01-13 08:39:00 -05:00