Commit graph

6243 commits

Author SHA1 Message Date
Colin Campbell
4a9ea1c632 Bug 9503 Correct name of parameter passed to parcel.pl
invoiceid was being passed as invoice causing GetInvoiceDetails
to silently fail and a system error downstream when
accessing the 'orders' element of the undefined invoice

Added an error message if GetInvoiceDetails called on undef

Signed-off-by: Galen Charlton <gmc@esilibrary.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-04 07:45:57 -05:00
0839645894 Bug 9439 - Enforce superlibrarian mutual exclusivity of other permissions
Basically, when you check the checkbox for the superlibrarian permission
in the patron record, it will disable and uncheck all the other
permission checkboxes. When you uncheck the checkbox for the
superlibrarian permission, it will renable those boxes. There is also
some JS code there to ensure that the other boxes are disabled when
returning to the change permission screen (i.e. the patch is not just a
click handler).

In the event that the checkboxes for superlibrarian and other
permissions are already checked, the user will be shown a pop-up window
explaining that the superlibrarian permission is mutually exclusive to
the others (since it already includes the others) and that the
permissions for that patron will then be reset to just include the
superlibrarian permission.

Comment: Tested on master. Works as described.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-01 11:30:35 -05:00
Vitor FERNANDES
e4f4566c05 Bug 9418: Some corrections and additions to about.tt
Test plan:

- Apply patch
- See if KEEP SOLUTIONS and C & P Bibliography Services
- Software Coop should be now software.coop

Bug 9418: Some corrections and additions to about.tt

Replaced & with &amp; according codelines.

Sponsored-by: KEEP SOLUTIONS

Combined to patches into one.
Reorder C-entries as per sort order.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-01 11:26:21 -05:00
4284cbf206 Bug 9526 - Patron statistics table is not pretty, needs circ toolbar
This patch adds the circ/members toolbar, corrects page title and
breadcrumbs, and adds some handling for column names which are coming
from the database. The table of statistics can display any items table
column specified in the StatisticsFields preference, but we can at least
embed the most obvious cases in the template for human readability: item
type, collection code, location, home library, and holding library.

To test, view the patron statistics page. For a patron with no
statistics you should see a message saying so. For a patron with
statistics you should see human-friendly labels for the columns
referenced above.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Works as described. No errors.
Wouldn't be better with centered cell contents?

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
FIX a typo:
- <h3>Statistcs for [% UNLESS ( I ) %][% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])</h3>
+ <h3>Statistics for [% UNLESS ( I ) %][% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])</h3>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-01 11:19:37 -05:00
Galen Charlton
6c1da551ea bug 9401: remove direct reads of CGISESSID cookie by JavaScript
Having embedded JavaScript read the session cookie directly
is unnecessary and prevents the CGISESSID cookie being marked
httpOnly as a security measure.  The only Koha JS attempting
this was the AJAX tags code.

To test:

- In general, verify that there are no regression withs
  adding tags in the OPAC or reviewing them in the staff interface.
- In specific, for the OPAC
  - log into the OPAC
  - retrieve a bib record
  - add a tag
  - refresh the bib details page to verify that the
    tag was added
  - make sure the TagsInputOnList syspref is on
  - perform a search
  - add a tag to more than one record from the search results page
  - repeat the preceding using the CCSR theme
- And in the staff interface
  - Go to the review tags tool
  - Reject a tag
  - Refresh to verify that the tag was rejected

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-01 11:05:35 -05:00
47609920b7 Bug 9265 - Switch to HTML5 doctype in OPAC and staff client
This patch replaces the XHTML DOCTYPE with an HTML5 one. The HTML5
validator seems to be significantly different than the XHTML one,
so I'm seeing lots of new errors. This patch includes corrections
for one: Deprecation of the "language" attribute of <script>
tags.

To test, view pages in the OPAC and staff client. They should
appear as normal. Numerous validation follow-ups will be required,
but I suggest these be handled incrementally.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
test on some intranet pages and I found no regression. (chromium and
firefox).
The w3c page about the doctype: http://www.w3.org/TR/html5-diff/#doctype

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:47:04 -05:00
9b9580bab9 Bug 9483 - Use DataTables on batch patron modifications page
Replace the tablesorter plugin with the DataTables plugin on the
batch patron modifications page.

To test, submit multiple patron barcodes for batch modification
(Tools -> Batch patron modification). Confirm that table sorting
works correctly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:42:54 -05:00
Liz Rea
60a86dcc31 Bug 9268 - Scanning in barcode or ISBN in Acquisitions -> new order submits the form unexpectedly
To Test:

* Go to Acquisitions - Manage Orders
* Search for a vendor
* Click New Basket.
* Fill required fields
* Press Save.
* Click on "From a new (empty) record"
* Type in title Private Oz, Author Patterson, James.
* Scan (or type) ISBN - 9781864711875.
* (If not scanning, PRESS ENTER HERE)
* Nothing should happen. Form should not be submitted, no error message
  should appear.

Sponsored by: Hauraki District Libraries, New Zealand

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested according to test plan in Firefox and Chromium on Ubuntu.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:40:03 -05:00
Liz Rea
1b2132fb76 Bug 9382 - updating permission labels
first, replicate:
go to More -> permissions on any user. Notice that it says various things "privileges, flags, permissions" they are interchangeable and inconsistent.
also note that some of the permissions are nonsensical and/or not descriptive enough, or not using canonical terminology (borrowers instead of patrons, for example)

To test:
interface consistency changes

-> means "turns into"

- page title - privileges -> permissions
- breadcrumbs - privileges -> permissions
- headings - privileges -> permissions
- "set flags" button -> save

Permissions that have changed description:

- Catalogue changes to "Required for staff login" in bold (this was the original impetus for this boatload of changes)
- reports
- editauthorities
- management
- serials
- updatecharges
- circulate
- parameters
- borrowers
- tools
- staffaccess
- edit_patrons (only on updatedb, not on new db)

- Read through and make sure there are no typos, and that the descriptions seem to jive with what privileges the permission gives the user. Suggestions are, in fact, welcome.

- If you are feeling ambitious, go ahead and create a new, clean database and check the wording there as well - it should match what has been done in the db update.

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

Tested both with existing database and new database

Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Tested with existing database.  Introduces no new mysql-isms.
Kudos for adding that syspref in bold, that got me when I first started with Koha
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:12:54 -05:00
Galen Charlton
facde98694 Bug 9494: update default LOC z39.50 target settings
This patch updates the seed data from the target list at
http://www.loc.gov/z3950/lcserver.html#addr.

Comment: new target works. updated deleting and reloading
sample targets.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
I agree with Galen that this may need to be incorproated as a follow-up
for current installations. Works fine for new installs
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:11:16 -05:00
Fridolyn SOMERS
9a5818c192 Bug 8942: Translation process breaks javascript (followup 2)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Tested all changes. Functionality is unchanged. Thanks for the taking
the extra effort to move alert strings into variables.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:00:24 -05:00
Fridolyn SOMERS
c80de7b69c Bug 8942: Translation process breaks javascript (followup 1)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Tested all effected functions. No change in functionality.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:00:24 -05:00
Fridolyn SOMERS
714075d5c1 Bug 8942: Translation process breaks javascript
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

I tested most scripts affected by this patch and visually verified
all changes. Functionality is unaffected.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:00:24 -05:00
Magnus Enger
3f2b5d270c Bug 9497 - Make it easier to add new encodings for Z39.50 servers and add ISO 8859-1
This patch does three things:
- Makes admin/z3950servers.pl create one variable for encoding,
  not one variable for each encoding
- Makes the template create encoding options from a list
- Adds ISO 8859-1 to the list of available encodings
See the bug for a lengthier description

To test:
- Apply the patch
- Edit one Z39.50 server several times, choosing each available
  encoding in turn
- Check that for each encoding, the correct encoding is shown both in
  the list of Z39.50 servers and in the dropdown on the edit screen

Comment: Works as described, no errors.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 10:53:11 -05:00
Srdjan
95077493bd Bug 7243: Rewording and renaming
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-24 09:17:12 -05:00
Srdjan
1b4a266915 Bug 7243: Be selective when summing up charges for blocking issues
Added RentalsInNoissueCharges and ManInvlsInNoissueCharges sys prefs

Created C4::Members::cwGetMemberAccountBallance()
* A wrapper for GetMemberAccountRecords that gives info on non-issue and
  other charges
* Other charges are:
  'Res'
  'Rent' if RentalsInNoissueCharges is Mo
  authorised_values MANUAL_INV if ManInvlsInNoissueCharges is No

C4::Members::GetMemberAccountRecords() changes:
* Dropped input param $date, it is not used

Use split charges in C4::Circulation::CanBookBeIssued() and
C4::Members::patronflags(). That way only fines decide whether an item
can be issued, and not other non-fine charges

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

Rebased (updatedatabase.pl)

ManInvInNoissueCharges and RentalsInNoissueCharges ar both included by default (= behaviour as before)

All variants tested: Both included, none included, manual invoice included, rentals included.
Works fine, blocks/does not blok as appropirate, messages appear as expected.

[Oct 12, 2012 marcelr:] Amended for updatedatabase.pl
Signed-off-by: M. de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-24 09:12:59 -05:00
Mathieu Saby
03acc19c7f Bug 9402: letter v between 2 option tags
In HTML code generated for advanced search, a useless "v" letter
is visible after "dissertation or thesis (revised)</option>".
This patch suppress "v" letter is outside <option> markup
(and cosmetic change : "Adult" -> "adult" in public types)

To test : check HTML code generated by advanced search.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes capitalization and a little problem in the HTML of an UNIMARC
plugin.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-24 08:56:14 -05:00
Jonathan Druart
1e5f6f6fbb Bug 9391: FIX display status in serials-collection
Caused by a bad copy/paste in Bug 8782

To test:
1) Look at the detail page of any subscription
2) Click on the serial collection link in the link list on the left
3) Look at the issues, create some new issues using the "Generate next"
button
4) Check status column of the table of issues

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes template variables. Passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-24 08:11:27 -05:00
MJ Ray
99e1fa291a Bug 9407: patrons search should match substrings
If a patron lives at 4345 Library Rd, a search on Street Address for
    Library should find it. However, it does not, but a search for 4345
    Library does.  This patch adds a "Search Type" drop-down, defaulting
    to the current behaviour.

    To test:
    1) Search for a patron based on a non-leading part of a field.
    2) Should return no results.
    3) Search again with "Search Type" of "Contains".
    4) Should return the patron.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-22 18:56:23 -05:00
Matthias Meusburger
56878f1453 Bug 7678: Adds extended patron attributes in patron reports
This patch allows to choose row and column amongst extended patron
attributes and to filter on them in reports/borrower_stats.pl

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

Great, I was looking for such a feature.
Patch works as expected.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-22 18:35:07 -05:00
Jonathan Druart
9f8490e0e3 Bug 9236 : Redirect to the parcel page after deleting an item/order
Signed-off-by: mathieu saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) Receive shipment for a previously created basket with
  multiple order lines
2) Verify 'Delete order' links only have 2 parameters and
  when you delete an order, you are not redirected to the
  basket.
3) Verify the same is true for 'Delete order and catalog
  record'.
4) Apply both patches from Bug 9236.
5) Redo tests and verify page redirects correctly now.
  Links now also show the basket number as third parameter.

Also: make sure orders/items and records are deleted correctly.

Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-21 08:40:44 -05:00
Jonathan Druart
ce9f100328 Bug 9236: FIX delete order when receiving
Before this patch the "delete order" links were broken on the receiving
page (parcel.pl)

Signed-off-by: mathieu saby <mathieu.saby@univ-rennes2.fr>
Before applying the patch, when recieving a parcel,
if you delete an order line, Koha tries to open the
page of the basket linked to that order, but can
not find it. Koha displays "Vendor not found".
With the patch, Koha finds the right basket.

I Sign off this patch, to be applied with the other patch ("Redirect to the parcel page after deleting an item/order")

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-21 08:40:43 -05:00
Bernardo Gonzalez Kriegel
5a7afe0d72 Bug 9357: Missing 'c' option in MARC21 LEADER_18 value builder
This patch adds option 'c' to the position 18
of the leader value builder.
Also corrects label for option 'i'

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Works as described
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-18 19:10:31 -05:00
4c23d24f40 Bug 9108 - Add uk/euro date sort filter to pages which require it
This patch adds the JS required to enable correct sorting
of dates in DD/MM/YYYY format to pages which require it.

To test, set your dateformat accordingly and confirm on the
affected pages that dates are sorted correctly.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Resolved conflict in serials/serials-search.tt.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 21:59:30 -05:00
04a58c4004 Bug 9310 - Patron image upload template corrections
This patch fixes some template structure problems and makes some
improvements:

- Correct grid structure so that page isn't narrower than it needs
  to be.
- Move image upload messages out of message/error dialog and into
  table so that lines are distinct and legible.
- Expand breadcrumbs specificity
- Capitalization corrections

To test: Upload patron images using both single images and zip files.
Test zip file upload with a file which contains valid and invalid
contents (non-existant patron numbers, invalid image files, etc). In all
cases image uploads should work correctly and errors should be legibly
displayed.

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

With patch, error messages are displayed  in a nice table.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Tested with zip and png files. Works great.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 21:53:42 -05:00
Galen Charlton
c7629376fc Bug 9376: extend HTML fix to moremember-brief.tt
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 21:08:48 -05:00
Vitor FERNANDES
7be86cd481 Bug 9376: Problem with dateexpiry display in moremember.tt
There is a problem that brokens the interface of moremmeber when
displaying the date expiry when renewing a patron.
In the first comment I said that the line that causes the error
should be:

<span class="reregitryinfo">[% dateexpiry %]</span>

but the correct way should be:

<strong class="reregitryinfo">[% dateexpiry %]</strong>

This way the date expiry after renew a patron appears in bold.

Test plan:

- before applying the patch try to renew a patron and check
  that almost everything went bold
- apply the patch
- renew a patron and only the expiration date is bolder.
- Note that the bug doesn't manifest in master because
  the patch for bug 6261 causes the invalid HTML to never
  be reached; it *does* affect 3.10.x and earlier.

Sponsored-by: KEEP SOLUTIONS
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 21:08:48 -05:00
67be30c822 Bug 9229 - branch code instead of name in subscription-detail.pl
This patch corrects the problem by using the KohaBranchName plugin.

Test plan:
Go in a subscription detail page.
Check that the "Library" information is changed from the branchcode to
the branchname

Signed-off-by: Fridolyn SOMERS <fridolyn.somers@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 21:00:47 -05:00
Corey Fuimaono
64a6f9a977 Bug 9398 - [ ? ] Link Lacks Context for All General Users (Accessibility) [Contexual Help]
testing procedure:
1. see that [ ? ] has simply been changed to 'Help'

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
I like this change, the context is improved even for sighted individuals, and it helps screen reader users a great deal.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
The new 'Help' doesn't take up a lot more space than the old '[ ? ]'
and makes it easier to undertand what will happen when you click on it.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 20:58:17 -05:00
Jared Camins-Esakov
8bfba2d98f Add Fred Pierre to history
Welcome, Fred Pierre! You are the 201st committer to Koha.
2013-01-17 20:55:20 -05:00
Fred Pierre
09ec1bef38 Bug 8401 : Highlighting of search terms in preference causes loss of data
To test:

1/ Go to system preferences
2/ Go to SCOUserCSS
3/ Add #self
4/ Search for self
5/ Open SCOUserCSS
6/ Note it now contains only # (Do not click save)
7/ Apply the patch
8/ Refresh the page, and check SCOUserCSS and note it now says #self
9/ Rejoice!

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely and passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 20:53:40 -05:00
Jared Camins-Esakov
e6ea3db830 Add Corey Fuimaono to history
Welcome, Corey Fuimaono! You are the 200th developer to have a patch
committed to Koha.
2013-01-17 18:30:25 -05:00
Corey Fuimaono
a3cb99841e Bug 9179 - Incorrect capitalization in serials-collection.pl
testing procedure:
1. Make Subscription for Valid/Test Item
2. Look at Serial Collection Information and catagorize Item as "Arrived"
3. Click "Generate next". Observe Capitalization is Correct.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes capitalization for 'Generate next' button.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 18:27:52 -05:00
Jared Camins-Esakov
0043240b4b Add Hugh Davenport to history
Welcome, Hugh Davenport! You are the 199th developer to have a patch committed
to Koha.
2013-01-17 18:23:19 -05:00
Hugh Davenport
2eca979109 Bug 9062 Fix spacing next to tax rate
On the supplier view screen, there was a space after the discount
and before the % sign, but there was none for the tax rate.

This patch adds in a patch, so they look similar.

Signed-off-by: Hugh Davenport <hugh@davenport.net.nz>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tiny follow-up, fixes spacing.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 18:18:15 -05:00
Hugh Davenport
55cf86e230 Bug 9062 Fix format for discount rate for vendors
On the vendor display and edit screens, the tax rate information was
formatted to 1 decimal point, while the discount rate was not.

This patch adds a format string to the discount information so that
it is formatted in the same way.

Signed-off-by: Hugh Davenport <hugh@davenport.net.nz>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Makes display on vendor detail page more consistent and
passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-17 18:18:14 -05:00
Fridolyn SOMERS
bc71428571 Bug 8443: Suggestions publication year and copyright date (follow-up 2) Cosmetic changes and perltidy formatting
Cosmetic patch :

Manual editions :
- use of () for qw
- use of q{} or qq{} in SQL queries
- replacing $${key} by $->{key}
- formatting SQL queries (easier to read)
- in suggestion.tt reducing date input size to allow calendar icon on same line

+ Formatting with perltidy

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests were done with all 3 patches from this bug applied:

1) Add suggestion from OPAC, check copyright date is saved
2) Add suggestion in intranet, check copyright date is saved
3) Edit suggestion, check change is saved correctly
4) Check date filters work as expected, using single dates, date ranges
   and multiple filters at once:
  - Accepted on
  - Managed on
  - Suggested on
5) Check copyright date search works correctly.

Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-15 22:10:59 -05:00
Fridolyn SOMERS
7ca9093f03 Bug 8443: Suggestions publication year and copyright date
Main patch correcting suggestions search :
- allow filtering on copyrightdate, manageddate and accepteddate
- entered dates remains in filter during search
- empty and null values are in the same tab
- null/empty values are not present in filers comboboxes

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-15 22:10:59 -05:00
Nicole C. Engard
be356e1a07 Bug 9306: Update descriptions for the 4 SeparateHoldings prefs
Patch updates the text of the SeparateHoldings and OpacSeparateHoldings
preference descriptions to be more readable.

To test, apply the patch and check the text of the preferences.

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

Description and test plan added.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-15 21:54:26 -05:00
67ad61070e Bug 9215 - non translatable string in manage-marc-import
Status information about staged MARC record batches was being pulled
directly from the import_batches table where they are stored as English
strings. This patch puts a check on the status value into the template
so that translatable strings can be embedded.

To test, apply the patch and view both the table of staged MARC record
batches and details about individual batches. In the default 'en'
translation you should see import statuses displayed with a capital
letter ("Staged"). This indicates that the status is now being pulled
from the template.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 23:26:54 -05:00
Adrien Saurat
356bf14f4d Bug 9182: fix on sortable columns on Saved reports
When displaying the Saved reports, since 3.10 the number of columns is
higher but the datasorter parameters have not been changed accordingly.
It's thus impossible to sort on the author or the creation date, for
example.

TEST PLAN :
1) Check sortable columns before applying : some useful columns are not
sortable, while the last columns are sortable (but don't need to be).

2) Once the patch is applied, the "non sortable" columns are the correct
ones.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Colums for saved reports are all sortable correctly now.
All tests and qa script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 23:23:59 -05:00
Chris Cormack
7e1a341d4e Bug 7143 updating history and about page
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Changes look to be correct

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 23:21:59 -05:00
Liz Rea
f13de4bdb6 Bug 6574 - js error in en-GB and en-NZ translations due to improper quoting
To replicate:

* install en-NZ translation (or en-GB)
* activate the new language, and select it for use
* pretend you are going to issue a book to a member (search for a member from "check out" in header)
* without the patch, the toolbar will be incorrect. The toolbar will also be incorrect on moremember.pl.

To test:
* apply the patch
* re-generate the en-NZ or en-GB translation
* activate the new language, or select it for use
* pretend you are going to issue a book to a member (search for a member from "check out" in header)
* with the patch, the toolbar will appear to be correct. It will also be correct on moremember.pl.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 23:17:08 -05:00
Jared Camins-Esakov
b4e255e4d7 Merge branch 'bug_8557' into 3.12-master 2013-01-14 23:08:49 -05:00
Liz Rea
a1c9272e2f Bug 8557 - Unexpected behavior with scanners
This is an alternative to the original implementation - this one works in chrome as well as firefox.

To test:

1)
Set syspref 'AcqCreateItem' to 'Create Item when receiving an order.'

2)
Create a basket for a vendor, add an order line.

3)
Search for this vendor using Vendor search

4)
Receive Shipment for this vendor and choose the title you ordered in 2)

5) You will get the dialog to create related item(s)

6)
Fill in Item 0 through o (see screenshot)

7)
Scan Barcode for field p - Barcode

7)
Result: Scanner sends a [return], form closes and you had no chance to fill in fields t - z

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

Tested with Chrome Version 23.0.1271.97 m  and Firefox 17.0.1, both behave as expected.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with Firefox and Chromium in Ubuntu.

Additional test done:
1) Add a new subscription, choose 'receive adds items'
2) Receive an issue, fill out $p with a barcode
3) Make sure hitting enter in the barcode field does not send the form.

All tests pass and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 23:07:42 -05:00
Julian Maurice
3de2b44782 Bug 9126: Do not return from Check too early.
If there is no errors, it should continue instead of returning true.

+ move a block of code at the end of Check function. This avoid
detaching and re-attaching a HTML block if there are errors.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
The following queries show us the issues:
select count(*) from items;
select * from aqorders_items where ordernumber=XX;

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:

AcqCreateItem = receive
UniqueItemFields = barcode

1) Create a new basket
2) Create a new order with quantity > 1
3) Close the basket and create a new invoice/shipment
4) Receive only 1 item.
   - Fill out the first item form with item type only. Click add.
   - Don't change second item form at all.
   - Click save.

Before patch:
2 items are created on the record, both with the selected itemtype.

After patch:
Only 1 item is created, which is correct.

Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Seems to work as described by the test plan
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 23:01:02 -05:00
Liz Rea
4df6f43a66 bug 9360 - Clean borrowers tool wording and layout problematic
To test:

Verify that the text has been changed to "Batch patron deletion/anonymization in the following places:

* tools-home
* the page title
* the heading on cleanborrowers
* the menu on cleanborrowers

Verify that the tool still works as intended.

This (finally) fixes the things Owen pointed out.
changes check-out to checkout per Galen.

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Fix indentation and tabulations characters
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-14 22:51:55 -05:00
Jonathan Druart
76dc0c73ae Bug 9076: Followup: FIX ergonomic issues
If no criteria is given, the form was submitted.
Labels were wrong

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-07 22:01:36 -05:00
568a4c1230 Bug 9076 - Add ability to delete borrowers by expiration date and category code to cleanborrowers.pl
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Tested per plan, works. Staff category is not shown, and patch passes automated testing.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-07 22:01:35 -05:00
f887edc3ab Bug 9335 - humanMsg popups don't disapear in webkit browsers
The popup message that appears after saving changes to system
preferences should dissapear upon any user actions (i.e mouse
click, mouse move, typing) but this does not happen in modern
webkit based browsers since jQuery was updated.

This patch adds the suggested fix to the jQuery plugin code as
suggested on https://code.google.com/p/humanmsg/issues/detail?id=9

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Tested with Google Chrome on Windows 7

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Tested with Google Chrome 22 and Firefox on Debian
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tested with the following browsers:
  Mac: Chrome 23, Firefox 16.0.2, Opera 11.61, Safari 5.1.7
  Windows: IE8, Firefox 3.6.26
2013-01-07 21:12:10 -05:00