Commit graph

16152 commits

Author SHA1 Message Date
Paul Poulain
a8c8cc3ca5 Bug 7903 follow-up, wrong capital cases
Also fixing a tiny indentation problem
2012-05-07 23:26:16 +02:00
Lyon3 Team
7a1b608472 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)

http://bugs.koha-community.org/show_bug.cgi?id=7903
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:21:34 +02:00
Gaetan Boisson
09cdcad460 Bug 7949 - a different favicon for the staff client
different favicon proposal

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:19:56 +02:00
Stéphane Delaune
ab602f9b76 bug 7990 - styl= in aqplan.tt
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:17:33 +02:00
Liz Rea
8eeda3a65c 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>

http://bugs.koha-community.org/show_bug.cgi?id=7959
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:16:49 +02:00
Magnus Enger
37311cf534 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>
2012-05-07 23:15:47 +02:00
Srdjan
b9f4a8cac6 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>
2012-05-07 23:00:34 +02:00
Katrin Fischer
aaad410dce 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>
2012-05-07 22:52:35 +02:00
Colin Campbell
d78c28db7b 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>
2012-05-07 22:49:54 +02:00
Katrin Fischer
548b85db85 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>
2012-05-07 22:26:57 +02:00
Katrin Fischer
86ae1e2849 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-07 22:26:53 +02:00
Katrin Fischer
22b6705b4f 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>
2012-05-07 22:23:49 +02:00
Robin Sheat
1a44578e2b Bug 8020 [3.8.x/MASTER] - update git build script to 3.9
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 22:06:02 +02:00
Robin Sheat
e7ef293975 Bug 8020 - [3.8.x] Update changelog for 3.8.0-1
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-05-07 22:06:00 +02:00
Robin Sheat
d6ec331bd6 Bug 8020 [3.8.x/MASTER] - update changelogs to get to 3.8
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-05-07 22:05:59 +02:00
Adrien Saurat
1ea7afdb57 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>
2012-05-07 22:00:09 +02:00
Adrien Saurat
d2bdcb4ca5 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>
2012-05-07 21:58:25 +02:00
Paul Poulain
3b41bd09ed Merge remote-tracking branch 'origin/new/bug_3969' 2012-05-07 21:49:42 +02:00
Katrin Fischer
39e5477f56 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.
2012-05-07 21:42:34 +02:00
Paul Poulain
a726cf2804 Bug 8002 follow-up to use 3.09 and MODIFY instead of 3.08 and CHANGE
see Ian comment 4 (http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8002)
2012-04-30 14:36:08 +02:00
50f1db6c77 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>
2012-04-30 14:28:49 +02:00
Paul Poulain
07cc9cd877 Merge remote-tracking branch 'origin/new/bug_7849' 2012-04-30 14:15:23 +02:00
Colin Campbell
49ba0df9e7 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-04-30 14:12:43 +02: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
f47ad12f9d Koha 3.8.0 Translation Update 2012-04-21 20:02:22 +02:00
d09260c58b Bug 7979 [FOLLOW-UP] New design for staff interface
This follow-up changes the structure of the page
so that it uses a standard YUI grid structure. This
helps keep the page flexible while preventing the
buttons from wrapping below the news block. The buttons
have been given a percentage width and a max-width value.

The benefit to flexibility is countered by the less-
strict spacing of the buttons. The columns of buttons
don't form a strict grid at higher screen widths.

There is probably a middle ground between this and
the previous design but I think we need to make it a
priority for the design not to break at 1024x768.

Another minor change: A tweak to the position and
padding of the icons.
2012-04-20 18:24:41 +02:00
Adrien Saurat
d830925be8 Bug 7979: New design for staff interface + fixes + css call moved
Many modifications, see bugzilla for more informations.
Moved the CSS call to allow override with intranetusercss.
2012-04-20 18:24:38 +02:00
Paul Poulain
67942f7432 Bug 3969 follow-up = budget name field is budget_name, not name 2012-04-20 16:59:35 +02:00
Katrin Fischer
eb2cedbfba Bug 3969: Budget search in acquisition does't work (search)
Search term was never evaluated.
Patch makes sure input param is correctly stored in the variable
and changes comparison to be case insensitive.

To test:
- Check search for fund codes (case insensitive) works
- Check search for fund code in combination with library works

The budgets to be shown can depend on your permissions.
Testing with with a superlibrarian should bring up all funds.

Also fixes warns in the logs that appeared when viewing the funds
for a budget without funds.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Funds are now searchable.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-20 16:41:11 +02:00
Chris Cormack
c606b53763 Bug 6931 : Only update frameworks for the correct marcflavour
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-20 16:25:35 +02:00
tajoli@cilea.it
dad005a8a1 Bug 7759, update of install files to use background indexing (and some whitespace tidy)
Signed-off-by: Mason James <mtj @ kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-20 16:11:52 +02:00
MJ Ray
7030a4f104 Bug 1577 - update INSTALL to mention need to translate templates
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-20 14:48:18 +02:00
Paul Poulain
6ae468b621 Adding Marc Veron 2012-04-19 18:28:11 +02:00
Elliott Davis
d06c231982 bug 7849 Instant Fine Calculation\n Adds functionality of calculate fines instantly. This is very important for Hourly loans becuase of a loophole from the cron.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 17:52:18 +02:00
Zeno Tajoli
e224e6e888 Bug 7861 : Update of italian sql files for 3.8
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 17:40:39 +02:00
Juan Romay Sieira
16e067953b Bug 7855 - marcflavour files changed to set the maxlength field into fresh installs. Include NORMARC in updatedatabase to change maxlength.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 17:20:13 +02:00
MJ Ray
1aef5ab44e Bug 6267 custom http user-agent in check-url.pl (fix for books.google.com 401 error)
Patch by Judit with a small change to the help wording.
Sponsored by CALYX information essentials.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 12:08:17 +02:00
Paul Poulain
6eb021ab0e Merge remote-tracking branch 'origin/new/bug_5347' 2012-04-19 11:53:44 +02:00
Chris Cormack
d83a71d8e6 Bug 5347 Follow up, fix for broken test 2012-04-19 11:40:02 +02:00
Paul Poulain
3dfe9903a5 Bug 7726: explanation and options that were in the wrong order
I also removed the ` mysql-ism

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-19 11:31:53 +02:00
4916080bc2 Bug 7950 - Typo for preference intranetuserjs
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 11:30:28 +02:00
Gaetan Boisson
5cb92abdcd Bug 7693 - clear screen button misaligned
This patch removes firefox specific lines in the css which were breaking the display

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

This fixes the layout problem in current versions of Firefox. I think
the CSS which is removed by this patch might be necessary for older
versions of Firefox, but if this turns out to be a problem we can
follow up.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 11:29:45 +02:00
096447f086 Bug 7828 - On circulation home page, URL to offline circulation Firefox addon should be a hyperlink
Along with making the URL a hyperlink I removed the language
part of the URL ("/fr/"). The link correctly redirects to 'en'
for me. I'm curious whether it will for other languages.

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

Link works and redirects to my language (english).

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

(Redirects to fr if your browser is FR)
2012-04-19 11:22:11 +02:00
Katrin Fischer
36fe07c3b6 Bug 3337 - RSS link is not correct for searches without results
RSS links for searches without results didn't have the search terms.

To test:
- Search for something with results and check RSS link
- Search for something with no results and check RSS link

In both cases your search should show up in the link.

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

RSS Link works in both cases listed in test plan.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 11:21:24 +02:00