Commit Graph

16171 Commits

Author SHA1 Message Date
Jonathan Druart edd73bb672 Bug 5345: DataTables integration in acquisition module [6]
histsearch.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-15 09:05:00 +12:00
Jonathan Druart dc493d12c2 Bug 5345: DataTables integration in acquisition module [10]
ordered.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-15 09:04:36 +12:00
Jonathan Druart f82634263e Bug 5345: DataTables integration in acquisition module [13]
spent.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-15 09:04:21 +12:00
Jonathan Druart 266991111b Bug 5345: DataTables integration in acquisition module [15]
uncertainprice.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-15 09:03:36 +12:00
Jonathan Druart eca18590b9 Bug 5345: DataTables integration in acquisition module [9]
newordersuggestion.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-15 09:03:17 +12:00
Srdjan 6cfa619305 bug_7647: Table sorter on issue history
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-15 09:02:52 +12:00
Magnus Enger 5f92267a38 Bug 7982: [SIGNED-OFF] Typo in moremember-receipt.tt
Changes "Checked uut today" to "Checked out today".

To test:
Um, just looking at the patch should be enough, I think?

signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-15 08:55:50 +12:00
Paul Poulain d64a5d1dde bug 8022 follow-up, missing permission in spanish
This patch should quiet jenkins

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-15 08:54:31 +12:00
Jared Camins-Esakov 53c9665144 Bug 8022: Permissions test doesn't check all languages
Add the permissions files for es-ES and nb-NO to the permissions test.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Running xt/permissions.t before the patch leaves out nb-NO and es-ES.
After the patch they are picked up and the test fails correctly
because of the missing permissions described in Bug 7984.
As far as I can tall, all permission files are now picked up by
this test.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-15 08:53:40 +12:00
Adrien Saurat 15393d1d8e Bug 8045: fixes "date due" when checking in
Added cloning of object parameters in "days_between" method.

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

Checked in items that were overdue, due in the future and not
checked out and all showed the right info in the check in
table.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-15 08:51:46 +12:00
Magnus Enger 51f9333695 Bug 7984 [SIGNED-OFF] - Fix the upload_local_cover_images permission
upload_local_cover_images is needed to use the new, cool local covers
feature

This patch
- adds upload_local_cover_images to
  installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
  from whch it was missing, making it impossible to use the local
  covers feature in an nb-NO installation
- translates the text of the preference for de-DE (thanks to cait,
  drojf and mveron for the translation)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Marc Veron <veron@veron.ch>

I did no fresh installs, however I
- had a look at the files before and after applying the patch
- carefully checked the syntax
- tested with MySQL by removing the entry in the table 'permissions'
  double checked that now the entry in Staff client was one
  and then did  an insert with the sql snippets.
  In DE-de the translated entry translation appeared as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-15 08:43:34 +12:00
Magnus Enger 72e85b40f1 Bug 7924 - Fix handling of command line arguments in koha-remove
koha-remove would fail with a message like this:
Removing Koha instance --
ERROR 1396 (HY000) at line 1: Operation DROP USER failed for 'koha_--'@'%'

After fixing this, the --keep-mysql option made the script exit without doing
anything.

To test:

Alt 1
- Build package with build-git-snapshot
- Install package

Alt 2
- Replicate the changes in the patch in an existing installation

Then:
- Add instance1 and instance2
- koha-remove instance1
-- Check that script completes and the databse is gone
- koha-remove --keep-mysql instance2
-- Check that the script completes but the database is not removed

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-15 08:39:33 +12:00
Kyle M Hall 7e8551cd9d Bug 8035 - bibs with comments show an error in opac
If a record has any approved comments, viewing the record
details in the opac will error out with the following
message:

Undefined subroutine &main::format_date called at
/home/load02/kohaclone/opac/opac-detail.pl line 654.

This is caused by a use of C4::Dates::format_date
without adding a use call to the head of the file.

Removing the call is the only change necessary. The
dates are already being filtered by $KohaDates.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-15 08:36:42 +12:00
Chris Cormack e9f61126e0 Bug 8072: [SIGNED-OFF] Changes in capitalisation had broken guided reports
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-15 08:35:49 +12:00
Owen Leonard d5c5bfc611 Bug 7877 - note on expiration in the opac worded wrongish
Correction following Nicole's suggestion.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-05-12 09:33:27 +12:00
Owen Leonard 13b474f111 Bug 7842 - Inconsistencies in Notices interface
- Putting "New" button in toolbar <div>
- Moving "Copy" function and making label more explicit
- Adding page headings
- Correcting table header sort options

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-05-12 09:26:18 +12:00
Owen Leonard e0499cc621 Bug 8048 - better spacing on categories for attributes
- Convert <h4> to <caption> and adding comfortable padding.
 - Add quotes to attribute for validity
 - Add padding to patron messaging note too since it has
   the same problem.

To test you must have at least one value added to the PA_CLASS
authorised value category. At least one patron attribute must
be categorized using that value.

On the patron edit screen that patron attribute category should
display with comfortable padding.

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

Looks much better!

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-05-12 09:21:25 +12:00
Jonathan Druart 7a7ae3f5a2 Bug 5345: DataTables integration in acquisition module [16]
z3950_search.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-05-12 09:18:14 +12:00
Paul Poulain 8b0cb4dbd1 Welcoming Lyon 3 team as a committer, and adding 3.8.0 release
Also fixing 3 space/tab mistakes

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-05-12 09:11:05 +12:00
Lyon3 Team cc6bdd4a23 Bug 7870 : Replace itemnumber by barcode in links of patron modification log
in the ISSUE and RETURN links to item

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Passes tests, works as expected. Perhaps for followup - items that have been deleted are linked, but do not work. If an itemnumber doesn't exist, it should not be linked.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-05-12 09:09:22 +12:00
Colin Campbell 3f5534d7cc Bug 6335 Set branch in sip session
The server returns its branch as the institution in the config file
However in transactions it will default to the homebranch of the
sip user which may not be consistent with that. Needs to set branch
in the session if there is a value in config otherwise statistics and
behaviour can be wrong (esp in discharge)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-12 07:49:41 +12:00
Jonathan Druart fc44674501 Bug 7820: Followup: Add missing Debian packages
Adds DateTime::Set used in Koha/Calendar.pm

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-11 23:12:46 +12:00
Ian Walls 1b6b8e00bd Bug 7820: Add missing Debian packages
Adds DateTime::Format::DateParse, Readonly, Readonly::XS and Modern::Perl
Debian packages to install_misc/debian.packages

Signed-off-by: Marc Balmer <marc@msys.ch>
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>

Sign off for Marc Balmer added manually by Ian Walls on Mar 24, 2012 by
permission (see IRC chat log)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-11 23:12:06 +12:00
Paul Poulain d7b29df506 Bug 7903 follow-up, wrong capital cases
Also fixing a tiny indentation problem

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 10:01:15 +12:00
Lyon3 Team 1c8f4c8fc0 Bug 7903: Add ordernumber column in orders history table
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

There was a conflict (whitespace changes causing a conflict)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 10:00:23 +12:00
Stéphane Delaune 419a7dbabe bug 7990 - styl= in aqplan.tt
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 09:58:04 +12:00
Liz Rea 0d2bf47a8a Bug 7953 - add opacuserjs to the sco template
To test:
add some jquery to opacuserjs that would change the screen
a la: $(".checkout label[for='patronid']").css("border","3px solid red");
verify you see a red box on the sco-main page.

Also adds the ability to use opacusercss to style sco-main.tt

to test:
Add some css to opacusercss that would change the screen:
.checkout { background: grey; }
verify you see a grey box around the checkout div.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 09:56:20 +12:00
Magnus Enger daca73c96a Bug 8008 - Fix typo in man page for koha-create
Line 121 had "/etc/koha/koha-site.conf" instead of "/etc/koha/koha-sites.conf"

To test:
I don't think this needs any actual testing, just read the patch and check
that it looks sensible...

Signed-off-by: Marc Veron <veron@veron.ch>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 09:55:08 +12:00
Srdjan ae48a3198e bug 6372: moved background-job.inc to background-job-progressbar.js
Check for div 0 when calculating percentage

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
div0 no longer appears on 0 size jobs.
Passes t xt

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 09:53:04 +12:00
Katrin Fischer 1754e0fa3e Bug 7929 - Duplicate id "availability" on XSLT result page
Changes id="availability" to class="availability" for XHTML valididy
(ids have to be unique on a page).

Signed-off-by: mveron <veron@veron.ch>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 09:49:34 +12:00
Colin Campbell 98436d47be Bug 7987 [SIGNED-OFF] Fix typo in circulation template
li was not properly closed after loss of a character

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

- Checked koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt before / after applying patch
- Line is changed as expected, ends now with </li>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 09:48:30 +12:00
Katrin Fischer e30a101b59 Bug 2399: Follow up removing MySQLisms from ru-RU and uk-UA sample files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 09:47:30 +12:00
Katrin Fischer bc853b720e Bug 2399: All status fields in the item edit interface offer two blank/null entries per dropdown instead of one
Removes the '0' values without description from the sample date for
authorised values.

To test:
1) Verify that SQL files load correctly
- truncate authorised_values; /* empty authorised values table */
- load sample data using one of the SQL files
2) Check cataloging interface - all status fields should only show 1 empty line

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 09:46:58 +12:00
Katrin Fischer 17b60dea53 Bug 3413: Checkboxes for new subfields not saving correctly
The bug was in the numbering of the fields and subfields in the form.
The form elements for the 'new subfield' got the same numbered names and ids as
the form elements for the second subfield. (example: repeatable1)
The patch fixes the numbering to continue to the new subfield.

To test:
- Create some new subfields and check all checkbox fields save correctly
  (mandatory, repeatable, is url)
- Check that other subfields' checkboxes are not changed
- Check existing subfields and newly created subfields can be edited

Signed-off-by: mveron <veron@veron.ch>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 09:42:52 +12:00
Robin Sheat e7ca2fb63b Bug 8020 - [3.8.x] Update changelog for 3.8.0-1
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 09:41:59 +12:00
Robin Sheat ea86502bd7 Bug 8020 [3.8.x/MASTER] - update changelogs to get to 3.8
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 09:41:08 +12:00
Adrien Saurat c5c88b2153 Bug 8025: corrects the return of a zero value for authorised values
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 09:40:24 +12:00
Adrien Saurat 702080eb86 Bug 8027: fix param order for z3950 INSERT
In the z3950servers.pl order of columns which are inserted
for new server is wrong, which results in empty timeout
and encoding values when new server is added.

Test scenario:

1. Open Z39.50 server administration
2. add new server with encoding and timeout
3. save server and verify that it has encoding and timeout

Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 09:39:33 +12:00
Katrin Fischer 37421c31e3 Bug 3969: Budget search in acquisition doesn't work (string changes)
String changes:
- Correcting tab name from "Search budgets" to "Seach funds"
- Changing search option from "Name" to "Fund code"

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Strings look a-ok.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 09:38:51 +12:00
Chris Cormack 6ce6ecd92d Database version bump 2012-05-08 09:36:32 +12:00
Owen Leonard 3a22e06c1b Bug 8002 [SIGNED-OFF][REVISED] Can't add patron attribute type in newer installation
Correcting patron_attributes_types definition in kohastructure.sql
to allow NULL entries for category_code, matching the definition
specified in updatedatabase.pl. Adds an entry to updatedatabase.pl
to correct existing installations with the incorrect table structure.

After running the updated updatedatabase.pl the category_code
column in borrower_attribute_types should show that it allows
NULL entries. Adding a new patron attribute type with no
patron category specified should work correctly.

To test the update to kohastructure.sql: Back up your Koha
database, drop it, and recreate it. Load the staff interface
and go through the web installer. After recreating the database
enable ExtendedPatronAttributes and try adding a new patron
attribute type with no patron category specified. The operation
should be successful.

signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
a new update for installations affected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-08 09:34:10 +12:00
Colin Campbell 60fe518c62 Fix typo in patch for bug 7849
$type declared twice effectively throwing away the returned value

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-01 09:54:40 +12:00
Paul Poulain 142c62081f Koha 3.8.0 bump 2012-04-23 16:28:46 +02:00
Paul Poulain 5c32a9f811 Release notes for 3.8.0 2012-04-23 12:42:07 +02:00
Paul Poulain 3a4ea95fe6 fixing missing " in french syspref file 2012-04-23 12:40:16 +02:00
Paul Poulain b3466c3319 Merge remote-tracking branch 'origin/new/bug_7979' 2012-04-23 11:41:50 +02:00
Paul Poulain cd9812c928 Bug 7979 tiny follow-up for translatability (string freeze)
A few tiny string changes have been introduced, that I revert with this patch as we're string freeze
* Advanced search had been changed to Advanced Search (useless capital S). this is a mistake, I've reverted
* same thing for Koha administration
* the suggestions/comment/tags links have had a <span> and : added, the translator tool consider them as being changed. Switching back to the previous display.

The suggestion/comment/tags change can probably be reintroduced later
2012-04-23 11:41:31 +02:00
Paul Poulain 465e58b594 Merge branch '3.8.0-translation' of git://git.tamil.fr/git/koha 2012-04-23 11:17:49 +02:00
Paul Poulain 5c4f4730b0 [PATCH] Bug 7979 [FOLLOW-UP] New design for staff interface, rights fix
Fixes display of pending links (with necessary permissions being
enforced).

(patch made by Adrien Saurat, does not apply on my computer for an unknown reason)
2012-04-23 11:01:12 +02:00
Frédéric Demians f47ad12f9d Koha 3.8.0 Translation Update 2012-04-21 20:02:22 +02:00