Commit Graph

18764 Commits

Author SHA1 Message Date
Owen Leonard 3000869e56 Bug 10111 - Layout on basket summary page a bit inconsistent
Some details in the summary of basket information were not marked up
consistently with others on the page. This patch makes the markup
consistent for a consistent appearance.

To test, view a basket in Acquisitions which is part of a basketgroup.
Information should be displayed consistently for baksets in both open
and closed basket groups.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Works as expected

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 72c95fa1cc)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 07:09:30 -04:00
Bernardo Gonzalez Kriegel 9f8bf846e3 Bug 6709 - marc21_field_006.xml and marc21_field_008.xml can't be translated
This patch changes
1) structure and schema for xml files used in MARC21
006 and 008 value builders.
2) JavaScript functions used to show value builders.

Xml processing is enabled in previous patch

Any translatable string has been moved to an xml element,
those strings that no need translation remains as xml
attributes.

NOTE_1: I do not include as translatable material types
codes, because those values are restricted in schema
definition. But this restriction can be removed.

NOTE_2: Anyone with experience in XML/XSD please
check the new schema definition.

NOTE_3: Anyone with experience in the former and
JavaScript please check xmlControlfield.js

To test:
1) Apply the patch
2) Verify that 006 and 008 value builders show and work
properly
3) Update translation files for your favorite language,
a new set of strings must show up corresponding to
names and descriptions on value builders.

Note: messed up patches, sending again.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Did regression tests on the plugins for 006 and 008 and could
spot no differences in behavior of the plugins to before.

Also tested the translation process and found it working nicely.
Thank you for fixing this long standing translation bug!
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit b6518e632d)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:56:27 -04:00
Chris Cormack 8e5dd776f3 Bug 6709 : Patch for testing translating .xml files
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on second patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 3588e2820e)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:55:56 -04:00
Chris Cormack cd58f73b7e Bug 10143 - Fixing license headers
Some files have the old 59 Temple address instead of the 51 Franklin
street.

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

I see lots more which will need to be corrected as well.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Corrects addresses in 3 files.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit c82facc012)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:47:58 -04:00
Fridolyn SOMERS 20b016beab Bug 10022 - Multiple tags moderation doesn't work on translated page
When using a translated intranet, tags moderation using checkboxes and a
submit button doesn't work. You get a message "Unknown Operation on x
Term(s)" (translated of course).

This patch corrects by using name="op-[operation]" instead of name="op"
in each submit input.

Test plan :
- Create a new tag on a record
- Go to tags moderation in Tools
=> You should see your tag in pending terms
- Click on checkbox
- Click on Approve or Reject submit button at the bottom of the table
=> Without patch the tag is still pending
=> With patch operation is well performed, tag is not pending
- Test "Check lists" form
- Test Approve and Reject buttons from "Actions" column

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 86511b380f)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:44:31 -04:00
Karam Qubsi 2fd425df26 Bug 10017: Follow up handling with the multi libraries pref active
This Follow up patch will handle multi libraries pref
when it sets to "add" and enhance the way lists drop down menu appear

 Test plan for all patches ( the first one and  all follow ups )  :
 1- apply the patches ( from the first one and all follow up patches)
 2- use 3.10 po files and update it (for the master) "
    ../misc/translate/ perl translate update ar-Arab "
 3- install Arabic from the updated po files
    "perl translate install ar-Arab "
 4- set opac opacthemes pref to ccsr
 5- set OpacAddMastheadLibraryPulldown pref to add
 6- select the Arabic from the opaclanguages pref
 7- set opaclanguagesdisplay  to allow
 8- go to the opac and choose  arabic
 9- you will see all the directions from right to left
    (as you look at koha on a mirror ;) ))

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

Comment: Work as decribed. No errors.
With all patches applied, we get a pretty RTL interface.
Well done!

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Changes are mostly CSS, one new image and a tiny template change.
Used po files from 3.8 for testing. Looks good!
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 11820f3c17)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:40:18 -04:00
Karam Qubsi c2038fa856 Bug 10017: Follow up OPAC-CCSR-Right-to-left-css
This follow up patch will delete the "-moz-box-sizing"
property that I was add when I'm doing some tests on
the rtl css file and  I forgot to delete it

many thanks David Cook for your notes deleting that property will not effect  on the results

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

Comment on last patch.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on last patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit da5b3c0cda)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:40:15 -04:00
Karam Qubsi 169f12072e Bug 10017: Fix CSS for right-to-left in CCSR theme
This patch will add css file for the Opac CCSR
link this css file in the doc-head-close.inc
and add new image : arrow-left-grey-11x6.png
for the opposite direction of the right existing one.

the test plan is the same for the oldest patches
for opac prog and intranet ...

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

Comment on last patch.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on last patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 2beeedafbe)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:40:07 -04:00
Owen Leonard 791cc43645 Bug 10083 - In Transit string doesn't get translated in the staff interface
For some reason this text inside a <td> isn't getting picked up by the
translator unless it's inside a <span>. This patch adds the span and
tidies up the text.

To test, apply the patch and "translate update" a translation. Searching
the po file for "In transit from" should return a result from detail.pl.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template only change fixing a translation problem.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 284e3e0d31)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:33:42 -04:00
Jonathan Druart 8a1cef2abf Bug 10145: The acquisition details block is badly placed.
Bug 5335 introduced a new "Acquisition details" block on the
subscription details page.
It is placed between to tabs and causes an ergonomic issue.

Test plan:
- Order a subscription.
- Go on the subscription detail page and select a tab.
- The "Acquisition details" block is moved from the bottom to the top of
the table.
- Apply the patch
- The "Acquisition details" block is always on the bottom of the table.

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes display problem, passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 53cdc66a0e)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:28:43 -04:00
Jared Camins-Esakov 08d7eeb354 Bug 10152: Default sorting wrong in parcels.pl
When you are receiving an order, the list of existing invoices should
appear in reverse chronological order. Unfortunately, right now it
appears in regular chronological order.

To test:
1) Make sure you have multiple invoices that have varying shipment
   dates for a vendor. We will assume this vendor is called "Example
   Vendor."
2) Choose the "Receive shipments" button on the Example Vendor page.
3) Note that the invoices are sorted by regular chronological order.
4) Apply patch.
5) Refresh "Receive shipment" page. Note that invoices are now sorted
   in reverse chronological order.
6) Sign off.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 23b9661efa)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:26:03 -04:00
Owen Leonard 87dc4277e5 Bug 10153 - Patron header search form is too wide
The patron header search form is now too wide to display correctly on
screens smaller than about 1110px. This patch groups the
previously shown-by-default choices with the hidden additional
search parameters.

To test, apply the patch and view any page which includes the patron
header search include, for example members/members-home.pl. Additional
search options should be hidden by default. Clicking "[+]" should show
all additional options: Search fields, search type, order by, library,
and category.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script. I like this change.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 065fe316ea)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:23:50 -04:00
Jared Camins-Esakov 39d352ce80 Add Edmund Balnaves to history
Welcome, Edmund. You are the 210th committer to Koha!
(cherry picked from commit 898e8f131c)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:21:55 -04:00
Edmund Balnaves 8f50590b3b Bug 8264 - local cover images not working in IE8 [ prog ]
[Patch submitted by David Cook]
Edmund, rather than myself, was the author of this patch,
so I'm not entirely sure about his code choices, but...it
looks like IE must process images differently than other
browsers.

It seems to me that the images are not appearing in IE,
because they're being regarded as incomplete or having
0/NULL natural width.

This patch simply introduces a try/catch hack where it
tries to add the image and remove any "no-image" elements
even nwhen the image is considered incomplete/width of
0/NULL. It won't do this if it catches any errors,
although I'm not sure that any errors would be caught
with this set up anyway...

It's certainly not the ideal solution, but it's a solution.

To Test:

Before applying the patch:
1) Use IE and FF/Chrome/other browser to view a record
   with local images attached
2) Note that the local images appear in FF/Chrome/other,
   but not in IE

Apply patch.

After applying the patch:
1) Repeat step 1 from above
2) Note that the local images now appear in all browsers
   as they should.

--

As I mentioned before, this seems like a real suboptimal
solution. Any ideas on why IE might be considering local
images to be incomplete or having 0/NULL natural width?

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I did a regression test using Chromium and Firefox in
Ubuntu. I checked both prog and CCSR - covers displayed
nicely.
All tests and QA script pass.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Changed author of patch to reflect actual authorship.
(cherry picked from commit 7e293e20de)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:21:51 -04:00
Jonathan Druart a8ee942442 Bug 10088: FIX adding an order from a staged file.
Bug 9902 introduced an issue in the C4::Items::PrepareItemrecordDisplay
routine. The existence of $defaulvalue hashref should be tested before
getting to the branchcode key.

Test plan:
Before applying the patch, an error occurred when you try to create an
order from a staged file.
After applying the patch, the error does not appear anymore.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit f2e44716f6)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-27 08:23:38 -04:00
Jared Camins-Esakov 59ce0cd4a6 Bug 2046: Increment version number
Database update for bug 2046 has been given version 3.11.00.203
(cherry picked from commit e1ecd7aa3f)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-27 08:12:29 -04:00
Kristina D.C. Hoeppner 8bb6bafbeb Bug 2046 - Suggestions: Title Field too small
Increase both on staff and OPAC interface
from 80 to 255 characters to be saved in
the database. Shown will be 80 characters.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Clean patch, workes as described.

To test:
- Apply patch and run database update
- Check that the column in the database is now varchar(255)
- Enter a new suggestion in the OPAC
- Edit this suggestion in staff
- Confirm form has the new max value set
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 7a5dc6eef5)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-27 08:12:25 -04:00
Jared Camins-Esakov 2dbe938606 Add Stefano Bargioni to the history
Welcome, Stefano, you are the 209th developer with a patch in Koha!

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 97596d9498)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-27 07:22:00 -04:00
Stefano Bargioni 239d37cb7e Bug 10093 - Typo in marc21_leader.tt
fixed a typo in marc 21 leader builder about the value 'b', Serial component part

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Good catch.
Template change only.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 9a449ce16c)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-27 07:21:56 -04:00
Marcel de Rooy b247b2c521 Bug 10110 Followup for Acquisition.pm
Adding a FIXE at a line that uses $sth->{NAME} for possible utf8 problems.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Adds a comment, no danger from that.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 8084a70a3b)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-27 07:15:49 -04:00
Marcel de Rooy 79a9b11a79 Bug 10110: Problems with diacritics in saved SQL reports
Adds decoding for cgi params (for completeness).
Apparently, the NAME attribute of DBI statement handle has a UTF8 bug.
Fixing this by decoding the returned column names.
Did this in a shared routine.

http://bugs.koha-community.org/show_bug.cgi?id=10110
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

Copying test plan from bug report:

Example SQL:
select
branchname as "Bibliothek (üöä)",
branchname "Bibiothek (üäa)",
branchname
from branches where branchcode = <<Bibliothekskürzel|branches>>

1) Create report with given example SQL or your own including
   some diacritics in the columnnames
2) Save the report and run it
3) Verify column names are broken before patch, but fixed after..

All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit d050e557f4)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-27 07:15:46 -04:00
Colin Campbell c48be8b905 Bug 9684 : Correct path to compact.xsl
When try to display card view of retrieved record
error occurred as compact.xsl could not be found
script was constructing path as though it was opac

Also added fallback to en version if no xsl file
found under current lang as done in opac-showmarc.pl

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

* Set sys pref to use CCSR
* Do a Z39.50 Search
* Click 'card' on one of the results
* confirm that there is no error.

All test pass

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I am astonished that opacthemes affects Z39.50 search in
staff so this might be fixing a bigger problem.

Checked that clicking on Card works for both themes now
correctly after I confirmed the bug.
Also all views in OPAC were checked for both themes.

All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 5b6f89714d)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-27 07:08:20 -04:00
Jared Camins-Esakov 00895bab83 Bug 9659 follow-up: correct syntax for older Perl
A construction that was a syntax error in older versions of Perl was
causing problems for jenkins. This patch fixes it.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 906bf789fe)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 21:33:34 -04:00
Marcel de Rooy 5e89a7e098 Bug 9886: ParseLetter removes too often punctuation characters from fields
This patch makes ParseLetter somewhat more restrictive in removing
punctuation characters from the end of a table field.
Based on the assumption that we want to remove punctuation from fields in
biblio and biblioitems (like ISBD).
ParseLetter should not remove e.g. a parenthesis in itemcallnumber, but still
removes e.g. a colon (:) at the end of a title.
Removed an unneeded global and lookahead from the regex.

Test plan:
1) Add a colon (:) to the end of a title.
2) Add a colon to the end of item copynumber.
3) Place a hold on that item. Check it in. Confirm hold.
4) Check the email or print notice generated. There should be no colon at the
end of the title, but the colon in the copynumber should still be there.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I compared checkout notices with lots of different fields before
and after applying the patch. For example the ) at the end of a
field in branches is now longer removed. Other fields looked ok
before and after.
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 4b1c71e91a)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 18:37:39 -04:00
Aaron Wells 6089118225 Bug 9671: Make fines.pl help text more accurate
To test:

run kohaclone/misc/cronjobs/fines.pl --help and note the help text. It should match the settings in System Preferences.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Documentation change, passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 109f316efb)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 18:36:01 -04:00
Katrin Fischer cb2fb765ef Bug 10040: Capitalization wrong when deleting subfields from authority
Confirmation message for deleting subfields from an authority framework
has wrong capitalization.

To reproduce:
1) Go to Administration > Authority types
2) Click on MARC structure for one of the authority types
3) Click on the subfields link for one of the fields
4) Delete one of the subfields

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 0f2945d768)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 18:33:07 -04:00
Marcel de Rooy 86e0a34bb1 Bug 10073: Show ccode or location also if not bound to Authorized Values in XSLT
If you do not have ccode or location governed by authorized value
(you can release this default connection in the marc structure),
these item values are not passed through in the items section,
created by buildKohaItemsNamespace for XSLTParse4Display.

This simple patch checks if the authorized value hash on ccode or
location returns something and passes the original value in otherwise.

Test plan:
Temporarily disconnect ccode and location from authorized values
in MARC structure.
Edit an item, put some values in location and ccode.
Look at this record via opac search (XSLT enabled). Toggle the value of
OPACItemLocation to show ccode or location before call number.
Restore authorized values-connection when applicable.

Note: Since bug 9995 adjusts OPAC XSLT Results, it may be helpful
to apply these
patches when testing this.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
This works as described for the XSLT result list.
The text is shown when OpacItemLocation is set to show collection
or location.

Note: Displaying location and collection without using authorised
values doesn't work in other places like the detail page item table.
So this will need more work to be fully functional.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit ab5c3eccf4)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 18:31:16 -04:00
Mirko Tietgen 5a086cfed7 Bug 10103 UniqueItemFields is missing from sysprefs.sql
Bug 7892 introduced UniqueItemFields but did not add it to sysprefs.sql.
Also fixes an unrelated  missing semicolon in sysprefs.sql

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>
(cherry picked from commit faa93aff62)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 18:17:13 -04:00
Jared Camins-Esakov 393b226aca Revert "Merge branch 'bug_9812' into 3.12-master"
This reverts commit 761c6213f4, reversing
changes made to c007557f24.

Reverted at request of author.
2013-04-26 18:15:19 -04:00
Kyle M Hall a80ef2bc98 Bug 9219 - Show damaged and lost statuses for issues on circulation.pl as they are on moremember.pl
This patch adds the lost and damaged status for an issued item to the
table of issued items on circulation.pl to make it align more closely to
the same table on moremember.pl

Test Plan:
1) Apply patch
2) Issue an item
3) Set the item's damaged status
4) Verify the status is showing near the date due on circulation.pl
5) Clear the damaged status and set the lost status again
6) Repeat step 4

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I could only test this with the DAMAGED value, because
currently lost items are removed from the patron account
when you set the status.
I know there is a patch somewhere
to make it optional and the change looks alright.
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 6385cfd1dc)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 08:19:04 -04:00
Jared Camins-Esakov 9522316ce2 Bug 9659: Move new unit test to db-dependent directory
C4::Reports::Guided requires a koha-conf.xml file to be in place in
order to load. This means that any test which uses it has to go in
t/db_dependent

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 1f9145bbbd)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 08:09:47 -04:00
Tomas Cohen Arazi 041beaa1d4 Bug 9659 - QA Follow up: Unit tests
Added some tests against the methods added by this patch.

To test, prove -v
- t/Koha.t
- t/ReportsGuided.t

Edit: fixed the amount of tests in the skip block. Tests fail for people having earlier versions of DBD::Mock.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works quite nicely!
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 6110375307)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 08:09:34 -04:00
Tomas Cohen Arazi f4c72bbc2a Bug 9659 - Better handling of non-existent authorised value categories used in SQL reports
A user might create a SQL report that relies on non-existent authorised value categories.
Because of a typo, or just because they copy&pasted the report from the Wiki.

Use cases are:

- The user creates a report from SQL
  a) Uses bad authorised values
  b) Clicks 'Save Report'
  c) Koha lists the problematic authorised values
  d) The user decides to
  e-1) Save it anyway, it gets saved
  e-2) Edit the report, it gets back to where it chose 'Save Report'

- The user edits an already saved report (Update SQL)
  a) Uses bad authorised values
  b) Clicks 'Update SQL'
  c) Koha lists the problematic authorised values
  d) The user decides to
  e-1) Save it anyway, it gets saved
  e-2) Edit the report, it gets back to where it chose 'Update SQL'

- The user tries to run a saved report that contains bad authorised values, Koha advertises the problem and provides the user with a button 'Edit SQL' to fix things.

To test, just create a report from SQL using invalid authorised values like this (misspelled 'branch'):

SELECT *
FROM itemtypes
WHERE hola=<<Test branch1|branchee>> AND
      hola2=<<Test branch2|brancha>>

Regards
To+

Notes:
- I added several comments on the code.
- Fixed an annoying warning of uninitialised variable also (refactored some tiny bits to do it).
- Added the following methods
   -  C4::Reports::Guided::GetReservedAuthorisedValues
   -  C4::Reports::Guided::GetParametersFromSQL
   -  C4::Reports::Guided::IsAuthorisedValueValid
   -  C4::Reports::Guided::ValidateSQLParameters
   -  C4::Koha::IsAuthorisedValueCategory
- Those methods could have been used to refactor this guided reports code as its *a bit messy*. I chose to do it in a new bug of course :-D.
- Fixed some trivial perlcritic -5 errors
- Removed some debugging stuff left by mistake
- Fixed some POD problems
- Optimal SQL-driven IsAuthorisedValueCategory method
- Thanks to Owen and Jared for their patience heh.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Work as described. No koha-qa errors.

Test:
Tried with examples (from help and test plan) reports, correctly
identifies invalid authorized values, and no problem with
authorized ones.

NOTE: Online help for this does not states that partial values
need to be between '%' in a SQLish way. Perhaps this could be
addressed inserting % in values or adding a checkbox (partial|exact).
Or changing help.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit cdc5e11159)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 08:09:32 -04:00
Tomas Cohen Arazi b391e79c2e Bug 10107 - opacbookbag shouldn't prevent from adding items to a list in the OPAC
This bug is present in master and (at least 3.8.x, where we spotted it).
The patch makes adding items, to a list from the results page, not rely
only on opacbookbag syspref but also 'virtualshelves'.

Regards
To+

PS: Thanks Graciela Galli for reporting.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template only patch, works nicely.
Test plan copied from bug report:

- Disable the opacbookbag syspref
- Login in the OPAC
- Create a list (I tested a private one)
- Search in your db for some biblios.
- Choose some and add them to the created list
- Go to your users's page, to the my lists tab
- Your list is empty.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 545573d333)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 07:55:57 -04:00
Owen Leonard 5bff5aa448 Bug 10115 - Hiding advanced search in Orders search tab removes plus button
The logic of the JavaScript for showing and hiding additional options in
the orders search form wasn't quite right, resulting in the +/- control
being hidden incorrectly.

This patch corrects and simplifies the JS in order to fix the problem.

To test:
 - Open any page in Acquisitions which shows the orders search
   form in the header search bar (for instance, Acquisitions home).
 - Open the orders search tab and click on the "+" to show more
   options.
 - Click the "-" to hide the additional options. The additional options
   should now be hidden and the "+" displayed.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Works as expected
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit f8130fb848)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 07:54:18 -04:00
Jared Camins-Esakov 0d5916987e Revert "Merge branch 'bug_6554' into 3.12-master"
This reverts commit 9c0b2e408b, reversing
changes made to 65ea963e52.
6554 considered harmful

Conflicts:

	opac/opac-search.pl
2013-04-25 22:37:54 -04:00
Jared Camins-Esakov 90756506f9 Revert "Bug 6554 Fix error caused by modifying $_ in a map"
This reverts commit 32a0703092.
6554 considered harmful.
2013-04-25 22:33:19 -04:00
Jared Camins-Esakov a0ede79720 Revert "Bug 10074 - Encoding problems at login time"
This reverts commit 1ee3892529.
6554 considered harmful.
2013-04-25 22:32:57 -04:00
Jared Camins-Esakov abb1b2839c Revert "Bug 10074 - Encoding problems for installer"
This reverts commit 362d399e48.
6554 considered harmful.
2013-04-25 22:32:43 -04:00
Jared Camins-Esakov 86409db5d9 Revert "Bug 10074: QA Followup for InstallAuth.pm"
This reverts commit c509ea3f18.
6554 considered harmful.
2013-04-25 22:32:26 -04:00
Jared Camins-Esakov 7f7c80a150 Revert "Bug 10019: Fix for userid containing UTF8 chars"
This reverts commit 678884ba38.
6554 considered harmful.
2013-04-25 22:32:13 -04:00
Jared Camins-Esakov b54f971beb Revert "Bug 9951: Followup for Tools"
This reverts commit 22c88aa4cd.
6554 considered harmful.
2013-04-25 22:31:49 -04:00
Jared Camins-Esakov 4dc5411423 Revert "Bug 9951: Followup for tools/viewlog.pl"
This reverts commit 5c4c680fa6.
6554 considered harmful.
2013-04-25 22:31:21 -04:00
Liz Rea 6edaffcdb1 Bug 10006 - holding branch is not available to XSLT display
To test:

Use attached XSLT stylesheet for OPAC Results
 * set your OPACXSLTResultsDisplay to use the attached stylesheet. The path is the FULL PATH, from /, to the file.
 * be sure to copy MARC21slimUtils.xsl to the same folder, or change the path in the attached one to point to the correct path on your filesystem.

Verify that the OPAC results now show the holding branch instead of the home branch.

Possible fail states:

* no branch is shown (only call numbers, if given)
* the wrong branch is shown

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 0942cac72e)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 22:14:31 -04:00
Mathieu Saby 74a458b853 Bug 9831: Correct and add authorised values un French UNIMARC installer
2d version, Correcting a typo

In French UNIMARC mandatory installer, some authorised values for languages, countries and unimarc function codes are wrong.
A lot of unimarc function codes and language codes are missing.
Reference for country codes is ISO 3166-1 standard
Reference for language codes is ISO 632-2 standard
Reference for Unimarc function codes are Unimarc Manual (french version online in BNF website and ABES website)

This patch correct wrong values and add new ones.
For the moment I keep some wrong codes, because they may be used by some librairies :
- language codes deu, lan, mla, sam
- function codes 571, 573, 574, 575

To test :
1) take a fresh new koha
2) apply patch
3) install Koha, choosing French UNIMARC settings
4) look if values are OK in authorised values and if you can use them in cataloguing module

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
SQL change only, French installer installs authorised values
without problems.

Note: There is a problem loading sample labels unrelated to this
patch:

sample_labels.sql
ERROR 1146 (42S02) at line 3: Table 'koha.labels_templates' doesn't exist
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 5959154bc1)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 22:13:33 -04:00
Katrin Fischer 3054241585 Bug 10045: Switch budget to fund in suggestions
Labels are budget, but should be fund.

To test:
1) Check the table on the suggestions page.
2) Check the suggestion edit form.
3) Check the suggestion display.

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>
(cherry picked from commit cd14dae772)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 22:11:27 -04:00
Owen Leonard c124e48057 Bug 10106 - Markup error causing misplacement of "reopen" checkbox on invoice edit screen
A misplaced closing </li> causes the "reopen" checkbox to be misplaced
if you're editing the a closed invoice. This patch puts the </li> in its
proper place.

To test, view a closed invoice (Acquisitions -> Vendor -> Invoices) and
confirm that the "reopen" checkbox is correctly placed.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Problem easy to spot, patch fixes it perfectly.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit fc34239c7d)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 22:08:38 -04:00
Katrin Fischer c8f91111c0 Bug 8068: Standardize terms used on acquisitions statistics
branch > library
budget > fund
bookseller, supplier > vendor
and capitalization

To test:
1) Go to Reports > Acquisitions statistics
2) Check the labels and options of the form for correctness.
3) Run a few test searches to make sure functionality is
   unchanged.

Unfortunately, some strings are from the .pl file, so a follow
up moving those to the templates is needed.
To make the changes consistent I have changed them in the .pl file.

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>
(cherry picked from commit 8e222dcdcc)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 22:06:17 -04:00
Owen Leonard 9d612da96b Bug 9766 - Remove YUI menu on budget planning page in favor of different column-hiding system
The budget planning table previously used a YUI menu as part of a
system for hiding and showing table columns. Instead of trying
to convert that sytem to Bootstrap I have used code from the
batch modification/deletion pages which uses a list of checkboxes
to show and hide table columns. This has the advantage of giving
the user visual feedback of what columns are hidden and of offering the
user an interface which is familiar from other pages.

This patch also moves CSS from a batch-operations-specific
CSS file into the main CSS file. Batch modification templates have been
modified accordingly.

To test, view the budget planning page and choose different
"plan by" options (by month, by library, by item type). Test
the show/hide action on each individual column and using the
"show all" and "hide all" checkboxes.

Signed-off-by: David Cook <dcook@prosentient.com.au>

Works as described.

This interface is also much more visually appealing, user-friendly, and informative than it was when it used the YUI menu.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 28518a033b)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:56:59 -04:00
Katrin Fischer 37cd791fd9 Bug 9818: Fixing capitalization and remove dollar sign
Overdue Fines Cap ($) > Overdue fines cap (amount)

To test:
Go to administration > circulation and fine rules
Check column label Overdue fines cap now follows capitalization rules
and has no dollar sign.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
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>
(cherry picked from commit 44a8ed7dec)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:53:47 -04:00