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>
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.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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 [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>
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>
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, 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
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.
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>
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 [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>
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>