Commit graph

7235 commits

Author SHA1 Message Date
Julian Maurice
1428a52341 Bug 8495: Fix JS error when creating a new order
bug introduced by bug 7178
(http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7178)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-28 17:51:24 +02:00
fd23761d4d Bug 3383 - Item due reminder digests - cannot display title information
Adds the ability to use branches.* fields in digest notices and
have them be parsed correctly. Also adds a warning to the notices
editor for digests.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I like the idea to show a warning, but I would perhaps move
it under the message body label to be more obvious.

Patch works nicely, branch data of my user's home library
is displayed in the notice.
2012-08-03 15:58:24 +02:00
Jonathan Druart
56c9fca729 Bug 7628: Escape '+' characters for categorycode
uri escape the following characters:
    &, @, /, ;, :, =, +, ? and $

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

Test and sign off second patch (independently from first patch).

Added categories like '+zwoelf' or '? Test' before applying the patch.
Deletion was not possible.

After applying patch deletion is possible, patch works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-03 15:01:03 +02:00
Marc Veron
e3e5b1892f Bug 7628 - Required format is not enforced for Patron Categories
Enforces category code with allowed characters only.

Test plan:

- Before applying patch, create a category code like Test+

- Try to delete category with this code -> does not work

- Apply patch

- Try to create category with code containg other characters than letters, numbers, - and _

- Result: You are not allowed to do so, appropriate message pops up

Signed-off-by: David Cook <dcook@prosentient.com.au>
2012-08-03 15:01:01 +02:00
daeb964996 8263 Consistent stylesheet prefs
This patch makes the use of opaccolorstylesheet and opaclayoutstylesheet more consistent. They may be: 1) just a file name, 2) a complete local path or 3) a full URL starting with http: for a remote css file.
This makes the syspref opacstylesheet that was only used for a remote css file obsolete.

June 20, 2012 Rebased.
July 18, 2012: Regex allows https too (thanks to Owen Leonard).

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-03 12:03:30 +02:00
Robin Sheat
8352e7c0fd Bug 8544 - make the RSS icon CSS-changeable
This gives the RSS bits on the search results some CSS classes so it can
be modified with CSS or javascript.

Updated: added also to the RSS icon shown when no results are found.
Signed-off-by: Marc Veron <veron@veron.ch>

Patch behaves as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-03 11:50:49 +02:00
Jonathan Druart
a281ac8df5 Bug 8385: Dirty patch to make tt_valid.t happy
A problem in routine text_replace_tag (tmpl_process3.pl) have to be
fixed to prevent this kind of patch :)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-03 11:44:59 +02:00
Dobrica Pavlinusic
28e5427c60 Bug 6448 [2/3] Barcodes::EAN13 autoBarcode
Implement auto-incrementing EAN-13 barcodes

To make this work, C4::Barcodes::next was modified to call process_tail with
new incremented value so that process_tail can generate correct checksum.
Since process_tail is currenlty not used by any barcodes, this change is safe.

C4::Barcodes is used by addbiblio.pl when adding multiple records, while value_builder
is used in all other cases.

Test scenario:

1. prove t/Barcodes_EAN13.t

2. KOHA_CONF=/etc/koha/sites/fer/koha-conf.xml prove t/db_dependent/Barcodes.t
   this will check C4::Barcode implementataion

3. in systempreference change autoBarcode to incremental EAN-13 barcode

4. edit two items of any biblio assigning barcodes and verify that numbers
   are increasing. Have in mind that last digit is check digit, and it
   doesn't increment, but is calculated from barcode itself. Example with
   checksum in brackets: 000000086275[2], 000000086276[9], 000000086277[6]

5. Add Item and verify that it gets assigned next barcode

6. Add & Duplicate item and verify barcode increase

7. Add Multiple Copies and verify that barcode increase for each copy

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 18:41:44 +02:00
Dobrica Pavlinusic
089b1151f5 Bug 6448 [1/3] EAN-13/UPC-A itemBarcodeInputFilter
This filter which check validity of EAN-13 barcode and padd it with zeros
up to full 13 digit number. This will also expand 12 digit UPC-A barcodes
to EAN-13 automatically which is useful for older barcode readers which tend
to ignore first zero in EAN-13 if they have just UPC-A support.

It should be noted that EAN-13 or UPC-A product codes printed on books are not
good choice for barcodes in Koha since each item has to have unique barcode.

Test scenario:

1. prove t/Circulation_barcodedecode.t
   this checks expansion of 12 digit UPC-A to 13 digit EAN-13 and zero padding

2. in systempreferences search for itemBarcodeInputFilter and select EAN-13

3. edit one item and assign it valid EAN-13 barcode, eg. 0000000695152, check it out

4. test checkin with just 695152 to test leading zero expansion

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-08-02 18:41:40 +02:00
Paul Poulain
09fa6e12e0 bug 8477 follow-up for [HTML4] coding guideline 2012-08-02 17:40:07 +02:00
Adrien Saurat
2fea7f0137 Bug 8477: Displays home/holding branches on return page
Signed-off-by: Mirko Tietgen <5p4m@gmx.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 17:38:47 +02:00
1000599eaa Bug 4198 - deleting an authority refreshes the page
Makes clicking a Delete link refresh the search that
was performed so that the results are still on the screen.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

Works as advertised. Very usefull. Still the issue that indexing being
not in real time, the search result displays the just deleted authority.
But there is no way to do better.
2012-08-02 15:43:08 +02:00
Jared Camins-Esakov
42e20381fb Bug 8520: fix authority display in staff client
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 15:38:31 +02:00
Elliott Davis
76f5ad2acf Added a URI filter to encode a cardnumber for borrowers as to not break patronimage.pl
To Test:

Add a + (or any char that would need to be encoded) to a card number of a patron with an image attached.
Go to member/moremember.pl.
If the patrons image is there, you are golden.

http://bugs.koha-community.org/show_bug.cgi?id=8421
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 14:17:10 +02:00
Jonathan Druart
0154d4beaa Bug 7470: Followup: Changes mailto links
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 14:15:11 +02:00
Paul Poulain
214de866c7 Bug 7470 follow-up: adding comments to avoid removal of this file
it is unused by Koha itself, but must be here for babeltheque customers !
2012-08-02 14:14:26 +02:00
Jonathan Druart
74d28933f7 Bug 7470: Followup Move Babeltheque css into a specific file
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 14:11:31 +02:00
a49526f426 Bug 8427 - Patron search results not consistent
Simple fix, removed the directive to order by surname, and the system
now orders by surname, then firstname.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 13:36:05 +02:00
Paul Poulain
927e09102d Bug 8432 follow-up, fixing error in T::T variable scope 2012-08-02 13:25:24 +02:00
Jonathan Druart
a02a9ff5ca Bug 8432: Change serials results display
The original author of this patch is : Julian Maurice

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 13:12:13 +02:00
Paul Poulain
3fb9229901 Bug 7839 follow-up fixing HTML4 coding guideline error
(Capital cases only on 1st word)
2012-08-02 12:06:05 +02:00
e31b55de31 Bug 7839 [ENH] : Add tab in patron record to show patron's routing lists
dcook: fixed SQL error and removed blank targets

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

Thanks. Works as described. Valuable addition on patron information
page.

Ideas of enhancement:

- For some library, and some patron, the routing lists table could be
  very long, and a paged table would be a plus.
- In the table, a new Vendor column.
- The possibility to sort the table entries by Title and Vendor column.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 11:26:43 +02:00
8231238311 Bug 8408 - Odd OPAC message when OPAC Renewals are disabled and OPACFineNoRenewals is set to blank
If OpacRenewalAllowed is set to "Don't allow" and OPACFineNoRenewals is set to blank ( i.e. disabled ).
A user who owes any fines, when logged in to the OPAC will receive the following message:

    Please note: You have more than 0.00 in fines.

This is a rather odd message, and is not very sensible. The message should either be modified or removed altogether.

This patch modifies the message to the following:

    Please note: You currently owe $fines in fines

where $fines in the formatted amount the borrower currently owes
in fines.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-01 17:43:03 +02:00
MJ Ray
fd6c23009b Add Street Address searchfields set to patrons search header widget
http://bugs.koha-community.org/show_bug.cgi?id=8516
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-01 17:36:22 +02:00
Chris Cormack
096d8a6e3d Bug 7143: Updating history and about file
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-01 14:20:06 +02:00
Jared Camins-Esakov
569e3823fd Bug 8204: Add user friendly authority view to OPAC
Up until now, the only authority view in the OPAC was a
rather-unfriendly expanded MARC view. This patch adds a user-friendly
view similar to the biblio details view.

Specific features to be aware of:
* Right-to-left text in the MARC21 880 field will show up in the
  appropriate location with the appropriate alignment and wrapping
* There is very little CSS styling. Any suggestions for how to make
  the display more attractive would be gratefully received.

To test:
1) Do a search for an authority in the OPAC.
2) Choose an authority record to view.
3) Observe that the view is more user-friendly and polished.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works very nicely now. The old view is still available, but the
user is presented with a nicer non-MARC view first.
2012-07-26 18:11:44 +02:00
Jared Camins-Esakov
899597c826 Bug 8208 follow-up: move Clear and Create new buttons out of results
Turns "Clear" and "Create new" links into buttons that are visible
before a search is performed, so that the user does not have to do
a search just to clear the field or create a new authority. This
commit also changes the formatting from textual links to buttons.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Nicer and more logical display.
Allows creating of a new authority without doing a search first
or when no results were found.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-26 17:47:50 +02:00
Jared Camins-Esakov
5ff81e2e8e Bug 8208: Add fast-add link to auth finder plugin
When performing subject analysis, it is not uncommon to find that an
authority record you need does not exist. This commit adds a link in
the search results to enable the cataloger to create an authority on
the fly and have the heading populated by the new authority.

To test:
1. Use the auth finder plugin the cataloguing module to search for a
   heading you do not have an authority record for.
2. Click the "Create new" link.
3. Fill in your authority and save it.
4. Note that the heading field was populated with the data you entered
   in the authority record.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) Added a new authority using the plugin
2) Used an existing authority using the plugin
3) Created a new authority in the authority module

All worked nicely.
2012-07-26 17:47:47 +02:00
Elliott Davis
381794ff4e [PATCH] bug_7420: Added overduefinescap to issuingrules
Replaced existing MaxFine syspref logic with overduefinescap.
Repurposed MaxFine to be the overall overdue limit for all items
overdue. Implemented new MaxFine logic in UpdateFine().

Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>
Tested according to Srdjan's test plan and everything worked like he said it would.  I set fined equal to $2 and max fine equal to $1.      When I ran the fines script for overdue items fines assessed were only $1.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-25 18:33:20 +02:00
Paul Poulain
5432bd488f Merge remote-tracking branch 'origin/new/bug_7889' 2012-07-25 15:08:50 +02:00
ba2f90dc77 Bug 7889 - Use standard style for errors and messages
Correcting the markup of error messages in three places:
catalogue merge, CSV profile editing, and opac comments.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-25 15:07:47 +02:00
Paul Poulain
22842ab258 Bug 7302 tiny follow-up removing </td><td>
to have the Export as CSV in the same cell as other buttons
2012-07-24 18:34:52 +02:00
Jonathan Druart
ee58361abb Bug 7302: Followup: rename "Client number" column with "Account number"
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-24 18:22:09 +02:00
Jonathan Druart
a6c93961b1 Bug 7302: Export basketgroup as CSV
Adds new action export for basketgroup.
This action is available only if your basketgroup is closed.
This export generates a csv file with order informations.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested together with bug 5356.
2012-07-24 18:22:06 +02:00
Magnus Enger
70588431b6 Bug 7367 - One "the" too many
On line 123 it says "of the the last". One "the" is probably enough.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-24 17:33:03 +02:00
b84c772e1b Bug 8392: Avoid having an untranslatable age range
Currently, error message reports an age range in English. For example '0 to
17'. With this patch, the 'to' is not in the .pl file anymore.

Ruth could you sign-off this fix?

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-24 17:20:46 +02:00
1106ed527a Bug 8414 - Intranet header toplinks display white rather than blue in < IE8
Removes IE7 hash hack which caused head toplinks to display white rather than dark blue against light blue background

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-24 16:49:49 +02:00
58b85e1df1 Bug 8448 - Holds Awaiting Pickup : Cancelling a hold on a waiting item with multiple holds displays a blank screen instead of a warning prompt
When you cancel a hold in the "Hold Waiting" tab of Holds Awaiting Pickup, you should be prompted to retain or transfer the hold for the next patron in the queue. However, instead of seeing this prompt, you are just shown white screen that fails to alert you to the fact that there are more holds on that item!

There is a missing FOREACH reference in waitingreserves.tt. The template tries to directly reference the hash within the cancel_results array, but we need to access the array before we can access the hash.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-24 16:39:34 +02:00
Fridolyn SOMERS
cbfe374cd6 Bug 8476: Little bug in OPAC XSLT on OPACURLOpenInNewWindow
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

I know where it comes from: vim cut-and-paste...

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-23 18:29:19 +02:00
Paul Poulain
37328c709e Merge remote-tracking branch 'origin/new/bug_8130' 2012-07-23 18:06:50 +02:00
05d952a4a6 Bug 8130 [FOLLOW-UP] attach PDF files to a patron record
Markup corrections:

- Hide table of files if no files are attached
- Move error messages out of table (invalid)
- Add <tr> tags to table (invalid)
- Apply standard form structure to upload form
- Add proper labels and ids to upload form
- Correct unescaped ampersands

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-07-23 18:05:58 +02:00
Srdjan
c1e5462db1 bug_8083: parameters subpermissions: manage_circ_rules and parameters_remaining_permissions
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-07-23 10:43:59 +02:00
Nicole C. Engard
23d447171b Bug 8453: Add spaces to inventory options
The home and current library labels were right on top
of the radio buttons. This patch just adds a bit of
space in there so that it's cleaner looking.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-18 15:08:27 +02:00
b932363f70 Bug 8422 - Fix impossible warning in circulation.pl when OverduesBlockCirc set to Block
Previously, the message Patron has x overdue item(s). Checkout anyway? was shown when syspref OverduesBlockCirc was set to Ask for confirmation or Block.

This patch changes the message for Block to: Checkouts are BLOCKED because patron has overdues.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-17 15:33:38 +02:00
Paul Poulain
b7b92a4c81 Merge remote-tracking branch 'origin/new/bug_6720' 2012-07-17 15:30:06 +02:00
Jared Camins-Esakov
ca7fa487c6 Bug 6720: Display the authority type in OPAC
Due to a peculiarity in the way SearchAuthorities worked, the authority
search results on the OPAC always listed the authority type that the
user searched for, rather than the authority type of the results.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, result list for OPAC search now shows the authority type
for each record.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased 20 June 2012.

Signed-off-by: Mirko Tietgen <5p4m@gmx.de>
Works as expected.
2012-07-17 15:25:39 +02:00
c90b392605 Bug 8398 - Missing image file in staff global css
This patch fixes a regression introduced by the fix for
Bug 6855 (bullet point showing in wrong place on error message)
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6855

The patch removes the re-introduced reference to a
background image which has since been removed. Testers should
check that this patch does not re-introduce Bug 6855.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I checked the styling of the error messages in Chromium and Firefox.
The logs are no longer complaining about the missing image.
Looks good to me.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-17 15:21:09 +02:00
Nicole C. Engard
d4306c508d Bug 8351: Update wording on staged marc
When undoing an import the 'success' message was
poorly worded. This patch fixes that.

Signed-off-by: Mirko Tietgen <5p4m@gmx.de>

works as expected

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-13 17:38:28 +02:00
Chris Hall
26cc37f76d bug 8322 removing additional spaces before fullstop on catalogue/detail and opac-detail pages.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-13 17:34:13 +02:00
Paul Poulain
60b6c187c4 Merge remote-tracking branch 'jcamins/bug_8281_qa' 2012-07-13 15:11:21 +02:00