Ian Walls [Thu, 22 Mar 2012 21:06:21 +0000 (17:06 -0400)]
Bug 5549 followup: fix suspension in days further
Grace periods are now measured in the same unit as the loan.
Suspension in days works explicitly in days, independent of unit. Since
the 'deltadays' duration is actually the duration, possibly in hours, between
when the material was due and when it's returned, we need to take the finedays
factor (how many days per unit overdue) and multiple it by 24 if the unit is
hourly.
Example: a 1 hour loan material with 1 hour grace period and finedays = 2,
returned 2 hours late would give 4 days suspension
To test:
1. create some circ rules:
A) an hourly loan rule with suspension in days
B) an hourly loan rule with suspension in days and a grace period
C) a daily loan rule with suspension in days
D) a daily loan rule with suspension in days and a grace period
2. Check out 2 materials under each rule. We'll call these A1-D1
and A2-D2 (to associate with the rule)
3. Return A1-D1 late, but within the grace period for B1 and D1 as appropriate
4. Return A2-D2 late, after the grace periods
You should get:
A1: suspended for (#hours late) * (#suspensionindays) days
B1: not suspended
C1: suspended for (#days late) * (#suspensionindays) days
D1: not suspended
A2: suspended for (#hours late) * (#suspensionindays) days
B2: suspended for (#hours late) * (#suspensionindays) days
C2: suspended for (#days late) * (#suspensionindays) days
D2: suspended for (#days late) * (#suspensionindays) days
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Mon, 14 May 2012 16:14:10 +0000 (18:14 +0200)]
Merge remote-tracking branch 'origin/new/bug_8022'
Paul Poulain [Mon, 14 May 2012 16:13:41 +0000 (18:13 +0200)]
bug 8022 follow-up, missing permission in spanish
This patch should quiet jenkins
Paul Poulain [Mon, 14 May 2012 14:18:46 +0000 (16:18 +0200)]
Merge remote-tracking branch 'origin/new/bug_7178'
Marcel de Rooy [Fri, 11 May 2012 14:38:50 +0000 (14:38 +0000)]
Followup 7178: Remove warning on uninitialized value in sprintf for neworderempty
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Julian Maurice [Wed, 28 Mar 2012 15:01:07 +0000 (17:01 +0200)]
Bug 7178: Follow-up Improve order item creation
Move SQL code from Perl script to Perl module
Replace SHOW COLUMNS by $dbh->column_info()
Update total on neworderempty.pl when adding or deleting items
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested ok for ordering and receiving items.
Total updated correctly.
Note: There are lots of errors in the logs before and after applying
the patch. A follow up is needed.
Jared Camins-Esakov [Sun, 13 May 2012 15:06:03 +0000 (11:06 -0400)]
Bug 7998: Don't make the news all bold
Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Liz Rea [Mon, 23 Apr 2012 16:07:51 +0000 (11:07 -0500)]
Bug 7998 - CSS fixes for new interface
Omnibus of changes thus far:
adds slight transparency for news so logo shows through on mainpage..
Fixes purple header gradient in Chrome-based browsers.
remove list from returns.tt options so checkboxes do not have bullets.
fix missing gradient class on returns.tt.
reverse colors of menu div - blue for inactive, grey for active.
turns searchheader blue, rounds corners, improves spacing for sort form.
Adds padding, rounded corners, and a 1px border to the now-blue toolbar.
increase width of intranet nav div to width 40%
add a bit of padding to #searchheader
fieldset.action changes - removed background, added a little padding to make it look better in all of the uses I could find of it.
Bug 7998 - followup - make facets header background blue
bug 7998 - followup - fixing headers on search.pl to be blue, rounded.
bug 7998 - followup - consistency tweaks
match menu borders to the search header tabs (green border)
hover menus a very light grey instead of #eee.
make fieldset.brief have a consistent border with the rest of the fieldsets.
bug 7998 - followup - more tabs/borders updating to fit in new look
boraccount.pl
bug 7998 - followup - add gradient div to prefs-admin-search.inc
Bug 7998 - Change toolbar to be lighter, with barely discernible border
Will need to be applied after the other patch.
Bug 7998 - add gradient to roadtype admin panel
Bug 7998 - adds gradient to patrons-admin-search.tt
Bug 7998 - add gradient to budgets-admin-search.inc
bug 7998 - add gradient to z3950-admin-search.inc
Bug 7998 - add gradient to cities-admin-search.inc
bug 7998 - active tab on checkout table now has green border like side menu
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Paul Poulain [Mon, 14 May 2012 13:42:47 +0000 (15:42 +0200)]
Merge remote-tracking branch 'origin/new/bug_5345'
Jonathan Druart [Fri, 17 Feb 2012 14:56:51 +0000 (15:56 +0100)]
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>
Jonathan Druart [Fri, 17 Feb 2012 14:58:20 +0000 (15:58 +0100)]
Bug 5345: DataTables integration in acquisition module [10]
ordered.tt
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Jonathan Druart [Fri, 17 Feb 2012 15:00:53 +0000 (16:00 +0100)]
Bug 5345: DataTables integration in acquisition module [13]
spent.tt
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Jonathan Druart [Fri, 17 Feb 2012 15:01:28 +0000 (16:01 +0100)]
Bug 5345: DataTables integration in acquisition module [15]
uncertainprice.tt
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Jonathan Druart [Fri, 17 Feb 2012 14:57:57 +0000 (15:57 +0100)]
Bug 5345: DataTables integration in acquisition module [9]
newordersuggestion.tt
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Srdjan [Thu, 29 Mar 2012 00:38:16 +0000 (13:38 +1300)]
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>
Magnus Enger [Thu, 19 Apr 2012 08:12:18 +0000 (10:12 +0200)]
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>
Jared Camins-Esakov [Sat, 28 Apr 2012 14:04:51 +0000 (10:04 -0400)]
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>
Adrien Saurat [Mon, 7 May 2012 14:11:11 +0000 (16:11 +0200)]
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>
Magnus Enger [Thu, 19 Apr 2012 19:22:01 +0000 (21:22 +0200)]
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>
Magnus Enger [Mon, 30 Apr 2012 11:49:38 +0000 (13:49 +0200)]
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>
Kyle M Hall [Wed, 9 May 2012 12:37:40 +0000 (08:37 -0400)]
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>
Chris Cormack [Fri, 11 May 2012 00:03:00 +0000 (12:03 +1200)]
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>
Owen Leonard [Wed, 9 May 2012 18:29:55 +0000 (14:29 -0400)]
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>
Owen Leonard [Wed, 9 May 2012 19:41:15 +0000 (15:41 -0400)]
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>
Paul Poulain [Fri, 11 May 2012 10:20:14 +0000 (12:20 +0200)]
Bug 7739 follow-up for capital cases
Amit Gupta [Wed, 18 Apr 2012 11:11:28 +0000 (16:41 +0530)]
Bug 7739 - Batch edit items of a title
A new option - Edit items in batch - is made available under the menu - Edit - in the catalog detail page. When this option is selected the tool batch item modification is called with all items under this biblio passed as parameters.
User can then edit all items of this biblio in batch. Once changes are saved the "done" link takes the user back to the catalog detail page of this biblio.
To test:
Navigate to catalog detail page of any biblio with one or more item records. Use the option "Edit items in batch" from the "Edit" menu. Modify the items in batch, say the collction code or lost status. Press "Save", verify that changes have been effected in the confirmation screen. Use the "Done" link to navigate back to the catalog detail page.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Wed, 9 May 2012 16:28:58 +0000 (12:28 -0400)]
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>
Paul Poulain [Fri, 11 May 2012 09:33:51 +0000 (11:33 +0200)]
Merge remote-tracking branch 'origin/new/bug_5345'
Jonathan Druart [Fri, 17 Feb 2012 15:01:47 +0000 (16:01 +0100)]
Bug 5345: DataTables integration in acquisition module [16]
z3950_search.tt
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Paul Poulain [Fri, 11 May 2012 09:28:25 +0000 (11:28 +0200)]
Welcoming Lyon 3 team as a committer, and adding 3.8.0 release
Also fixing 3 space/tab mistakes
Lyon3 Team [Mon, 2 Apr 2012 09:53:16 +0000 (11:53 +0200)]
Replace itemnumber by barcode in links of patron modification log
in the ISSUE and RETURN links to item
http://bugs.koha-community.org/show_bug.cgi?id=7870
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>
Paul Poulain [Fri, 11 May 2012 09:23:55 +0000 (11:23 +0200)]
Merge remote-tracking branch 'origin/new/bug_5184'
Owen Leonard [Tue, 17 Apr 2012 14:53:41 +0000 (10:53 -0400)]
Bug 5184 [REVISED] Upgrade jQuery to the latest version (OPAC)
Upgrade jQuery in the OPAC.
To test: Try any JavaScript-dependent interaction
you can think of in the OPAC and watch for errors.
Revision updates the one syntax I've found so far in testing
which requires an update. Where we used to do this to
uncheck a checkbox:
$(foo).attr("checked","");
We should now use:
$(foo).removeAttr("checked");
As far as I can tell the old way will not generate an error
but neither will it work.
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Colin Campbell [Thu, 2 Jun 2011 11:26:09 +0000 (12:26 +0100)]
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>
Jonathan Druart [Wed, 28 Mar 2012 13:27:50 +0000 (15:27 +0200)]
Bug 7820: Followup: Add missing Debian packages
Adds DateTime::Set used in Koha/Calendar.pm
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Ian Walls [Sat, 24 Mar 2012 13:50:29 +0000 (09:50 -0400)]
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)
Owen Leonard [Tue, 17 Apr 2012 15:21:14 +0000 (11:21 -0400)]
Bug 5184 - Upgrade jQuery to the latest version (staff client)
Upgrade jQuery in the staff client. Besides the change
to the jQuery file syntax has been changed wherever this
syntax was written:
$(foo).attr("checked","");
The new correct way to un-check a checkbox:
$(foo).removeAttr("checked");
I also removed some JavaScript altogether from
branch-transfer-limits.tt which used the old syntax but
which wasn't used on the page at all anymore.
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Fri, 11 May 2012 08:58:43 +0000 (10:58 +0200)]
Bug 7249 BDRev number
Paul Poulain [Fri, 11 May 2012 08:58:33 +0000 (10:58 +0200)]
bug 7249 follow-up, online help
Jared Camins-Esakov [Sun, 29 Apr 2012 19:41:30 +0000 (15:41 -0400)]
Bug 7249: Syspref to control number of rows in web service results
The original patches for bug 7249 had a hardcoded limit of ten rows in the
results returned by the web service. This patch adds a SvcMaxReportRows syspref
which allows the librarian to choose how many rows should be returned by the
web service.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Chris Hall [Mon, 21 Nov 2011 03:09:19 +0000 (16:09 +1300)]
Bug 7249 : Allow reports to be called through a restful interface
Hands back JSON, and supports caching
Squashed commit of the following:
commit
5c93506079738b9a13139417d3a0734289a4b007
Author: Chris Hall <chrish@catalyst.net.nz>
Date: Mon Nov 21 15:41:14 2011 +1300
Fixed bugs when creating reports, added more user friendly input and
feedback
commit
c62430bb358ee4af6ee5331b4d3a2ed67f723032
Author: Chris Hall <chrish@catalyst.net.nz>
Date: Mon Nov 21 12:00:27 2011 +1300
Added caching to intranet report webservices, added cache expiry and public
options to reports
commit
2d89f0777d95b26bf08635782070b6367d0698f3
Author: Chris Cormack <chris@bigballofwax.co.nz>
Date: Wed Nov 9 20:29:26 2011 +1300
Working on caching for services
commit
e0511f180cebd81747858ad776433fe3a1cf6854
Author: Chris Cormack <chris@bigballofwax.co.nz>
Date: Wed Nov 9 08:28:26 2011 +1300
Starting work on webservices
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch includes database update adding 2 new fields to the saved_sql table.
1) Checked that adding/deleting/editing of sql reports still works and new
fields are correctly saved to the database.
2) The saved reports page now lists the new fields correctly.
3) Checking URLs with JSON output
- if report is not public http://localhost/cgi-bin/koha/svc/report?id=2 fails,
but http://localhost:8080/cgi-bin/koha/svc/report?id=2 works
- if report is public, both links work
4) Checking results are cached
Created a report listing my borrowers, setting caching to 60 seconds and
added new borrowers before doing following tests.
- URL doesn't show new borrower immediately - correct
- Turning off the usecache system preference updates data - correct
- Restarting memcached updates data '/etc/init.d/memcached restart' - correct
- Waiting until cache time runs out updates data - correct
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Retested the feature and renewing my sign-off.
There are some things that should be noted:
- currently there is a hardcoded limit of 10 results for the reports webservice
- reports with runtime parameters are currently not supported
Owen Leonard [Wed, 11 Apr 2012 16:55:48 +0000 (12:55 -0400)]
Bug 7500 - Use CSS Sprites for faster page loading
This patch moves *most* small interface icons and
the Koha log into a single 10K sprite image. CSS
is used to position the sprite correctly for each
icon instance.
Not covered by this patch: XSLT icons, star ratings
icons, table sort icons (the latter which I don't
think can be done using this technique).
A follow-up patch should remove the individual images
which have been replaced by the sprite.
Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Mon, 7 May 2012 21:26:16 +0000 (23:26 +0200)]
Bug 7903 follow-up, wrong capital cases
Also fixing a tiny indentation problem
Lyon3 Team [Thu, 5 Apr 2012 13:14:39 +0000 (15:14 +0200)]
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>
Gaetan Boisson [Thu, 12 Apr 2012 16:24:05 +0000 (18:24 +0200)]
Bug 7949 - a different favicon for the staff client
different favicon proposal
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Stéphane Delaune [Fri, 20 Apr 2012 13:32:10 +0000 (15:32 +0200)]
bug 7990 - styl= in aqplan.tt
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Liz Rea [Thu, 12 Apr 2012 21:54:28 +0000 (16:54 -0500)]
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>
Magnus Enger [Wed, 25 Apr 2012 12:28:32 +0000 (14:28 +0200)]
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>
Srdjan [Fri, 23 Mar 2012 00:08:54 +0000 (13:08 +1300)]
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>
Katrin Fischer [Wed, 11 Apr 2012 06:06:00 +0000 (08:06 +0200)]
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>
Colin Campbell [Fri, 20 Apr 2012 11:16:13 +0000 (12:16 +0100)]
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>
Katrin Fischer [Tue, 3 Apr 2012 18:23:47 +0000 (20:23 +0200)]
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>
Katrin Fischer [Mon, 2 Apr 2012 17:28:37 +0000 (19:28 +0200)]
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>
Katrin Fischer [Mon, 9 Apr 2012 09:44:06 +0000 (11:44 +0200)]
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>
Robin Sheat [Sat, 28 Apr 2012 01:02:26 +0000 (13:02 +1200)]
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>
Robin Sheat [Sat, 28 Apr 2012 00:40:09 +0000 (12:40 +1200)]
Bug 8020 - [3.8.x] Update changelog for 3.8.0-1
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Robin Sheat [Wed, 26 Oct 2011 03:02:32 +0000 (16:02 +1300)]
Bug 8020 [3.8.x/MASTER] - update changelogs to get to 3.8
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Adrien Saurat [Mon, 30 Apr 2012 08:05:07 +0000 (10:05 +0200)]
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>
Adrien Saurat [Mon, 30 Apr 2012 10:15:13 +0000 (12:15 +0200)]
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>
Paul Poulain [Mon, 7 May 2012 19:49:42 +0000 (21:49 +0200)]
Merge remote-tracking branch 'origin/new/bug_3969'
Katrin Fischer [Sat, 14 Apr 2012 16:12:42 +0000 (18:12 +0200)]
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.
Paul Poulain [Mon, 30 Apr 2012 12:36:08 +0000 (14:36 +0200)]
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)
Owen Leonard [Tue, 24 Apr 2012 15:20:42 +0000 (11:20 -0400)]
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>
Paul Poulain [Mon, 30 Apr 2012 12:15:23 +0000 (14:15 +0200)]
Merge remote-tracking branch 'origin/new/bug_7849'
Colin Campbell [Tue, 24 Apr 2012 13:27:58 +0000 (14:27 +0100)]
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>
Paul Poulain [Mon, 23 Apr 2012 14:28:46 +0000 (16:28 +0200)]
Koha 3.8.0 bump
Paul Poulain [Mon, 23 Apr 2012 10:42:07 +0000 (12:42 +0200)]
Release notes for 3.8.0
Paul Poulain [Mon, 23 Apr 2012 10:40:16 +0000 (12:40 +0200)]
fixing missing " in french syspref file
Paul Poulain [Mon, 23 Apr 2012 09:41:50 +0000 (11:41 +0200)]
Merge remote-tracking branch 'origin/new/bug_7979'
Paul Poulain [Mon, 23 Apr 2012 09:41:31 +0000 (11:41 +0200)]
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
Paul Poulain [Mon, 23 Apr 2012 09:17:49 +0000 (11:17 +0200)]
Merge branch '3.8.0-translation' of git://git.tamil.fr/git/koha
Paul Poulain [Mon, 23 Apr 2012 09:01:12 +0000 (11:01 +0200)]
[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)
Frédéric Demians [Sat, 21 Apr 2012 18:02:22 +0000 (20:02 +0200)]
Koha 3.8.0 Translation Update
Owen Leonard [Thu, 19 Apr 2012 19:17:06 +0000 (15:17 -0400)]
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.
Adrien Saurat [Wed, 18 Apr 2012 12:53:19 +0000 (14:53 +0200)]
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.
Paul Poulain [Fri, 20 Apr 2012 14:59:35 +0000 (16:59 +0200)]
Bug 3969 follow-up = budget name field is budget_name, not name
Katrin Fischer [Sat, 14 Apr 2012 17:39:30 +0000 (19:39 +0200)]
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>
Chris Cormack [Thu, 19 Apr 2012 21:52:04 +0000 (09:52 +1200)]
Bug 6931 : Only update frameworks for the correct marcflavour
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
tajoli@cilea.it [Tue, 20 Mar 2012 15:31:20 +0000 (16:31 +0100)]
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>
MJ Ray [Wed, 18 Apr 2012 15:34:02 +0000 (16:34 +0100)]
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>
Paul Poulain [Thu, 19 Apr 2012 16:28:11 +0000 (18:28 +0200)]
Adding Marc Veron
Elliott Davis [Tue, 17 Apr 2012 10:38:14 +0000 (10:38 +0000)]
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>
Zeno Tajoli [Sat, 31 Mar 2012 15:42:52 +0000 (17:42 +0200)]
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>
Juan Romay Sieira [Fri, 30 Mar 2012 08:32:35 +0000 (10:32 +0200)]
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>
MJ Ray [Thu, 5 Apr 2012 12:18:07 +0000 (13:18 +0100)]
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>
Paul Poulain [Thu, 19 Apr 2012 09:53:44 +0000 (11:53 +0200)]
Merge remote-tracking branch 'origin/new/bug_5347'
Chris Cormack [Thu, 19 Apr 2012 09:33:04 +0000 (21:33 +1200)]
Bug 5347 Follow up, fix for broken test
Paul Poulain [Tue, 27 Mar 2012 07:56:33 +0000 (09:56 +0200)]
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>
Kyle M Hall [Thu, 12 Apr 2012 16:25:09 +0000 (12:25 -0400)]
Bug 7950 - Typo for preference intranetuserjs
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Gaetan Boisson [Thu, 12 Apr 2012 15:59:32 +0000 (17:59 +0200)]
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>
Owen Leonard [Wed, 11 Apr 2012 12:31:22 +0000 (08:31 -0400)]
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)
Katrin Fischer [Sat, 14 Apr 2012 22:09:34 +0000 (00:09 +0200)]
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>
Katrin Fischer [Thu, 12 Apr 2012 05:53:32 +0000 (07:53 +0200)]
Bug 7371: Add 'cardnumber' as option for AutoEmailPrimaryAddress
The systempref.sql file had one more option 'cardnumber' that was not
visible from the system preference editor. This patch adds the setting.
To test:
- Check new setting cardnumber is available for AutoEmailPrimaryAddress
- Use setting with a patron that has an email address as cardnumber and
verify email is sent out correctly.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Katrin Fischer [Sun, 15 Apr 2012 09:03:31 +0000 (11:03 +0200)]
Bug 7733 - HidePatronName not working on moredetail
Patch implements HidePatronName system preference for 'Checkout status'
on moredetail (tab items from staff detail page).
Also adds some new 'if' statements, so 'Serial enumeration' and 'Paid for?' are
only shown when they are not empty.
Silences warns in the logs.
To test:
- Toggle system preference for an issued item and check name/cardnumber
are displayed correctly.
- Check serial enumeration and Paid for? show when not empty.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Katrin Fischer [Sat, 14 Apr 2012 15:50:51 +0000 (17:50 +0200)]
Bug 7833 - unique holiday link broken
As Nicole stated on the bug the branchcode was missing from the links.
To test:
- add unique holidays to calendar for different branches
- click on link and check that the date is opened in the right calendar
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Clicked links for unique holidays and exceptions for
multiple branches and everything works perfectly.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Katrin Fischer [Mon, 9 Apr 2012 15:44:38 +0000 (17:44 +0200)]
Bug 7845: Multiple 260s don't display properly in search results
Corrects display for multiple 260 fields in intranet and OPAC.
In intranet the order of fields was wrong on the detail page.
In OPAC and intranet punctuation for multiple 260 fields in the
result list was not displaying properly.
Example after correction:
Publisher: Jena : Elsevier, 1907 ; Stuttgart : Franckh, 1907-1992 ; Jena : Urban & Fischer, 1993-2003
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Sun, 8 Apr 2012 11:30:10 +0000 (13:30 +0200)]
Bug 7922: Fixing typo in German sample news
Fehlerkorrektoren > Fehlerkorrekturen
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Thu, 19 Apr 2012 08:21:47 +0000 (10:21 +0200)]
Revert "Bug 7785: Remove unused function columns() which uses a MySQLism."
This reverts commit
1c8df08aea5eb173d7216cdfc9895fdd601a5f11.
See:
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7785#c5
and
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7975
This patch broke tools/import_borrowers.pl
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Sun, 15 Apr 2012 20:46:57 +0000 (16:46 -0400)]
Bug 7962 - Cart missing from result lists
Removing duplicate inclusion of jQuery on the results page
which was added with the star ratings feature. Koha already
uses jQuery by default.
I have also made the inclusion of ratings JS and CSS dependent
on ratings being turned on.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Katrin Fischer [Thu, 12 Apr 2012 06:59:32 +0000 (08:59 +0200)]
Bug 7354: Can't edit local use system preferences
Fixes adding and editing of local use system preferences and redirects to correct
page after saving.
To test:
- Create a new local use system preference
- Edit an existing local use system preference from summary page
- Edit an existing local use system preference using 'Edit'
- Delete a local use system preference
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>