koha.git
7 years agoBug 9604 - Follow-up: Changing labels from branch to library
Katrin Fischer [Fri, 22 Mar 2013 15:35:29 +0000 (16:35 +0100)]
Bug 9604 - Follow-up: Changing labels from branch to library

Relabelling the new filters for consistency.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 9604: filter overdues with homebranch and holdingbranch
Fridolyn SOMERS [Wed, 13 Feb 2013 08:41:29 +0000 (09:41 +0100)]
Bug 9604: filter overdues with homebranch and holdingbranch

This patch adds in overdues.pl filters on item home branch and holding branch.

Test plan :
Play with item home branch and holding branch filters and check
it filters well results.

Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Filters are added to the list of overdues in the circulation module.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_7973' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 02:01:49 +0000 (22:01 -0400)]
Merge branch 'bug_7973' into 3.12-master

7 years agoBug 7973 : Follow up to remove an extraneous my
Chris Cormack [Thu, 21 Mar 2013 21:51:31 +0000 (10:51 +1300)]
Bug 7973 : Follow up to remove an extraneous my

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes problem found by QA scripts.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 7973- Allow for new type of LDAP authentication
Rolando Isidoro [Fri, 19 Oct 2012 14:57:36 +0000 (15:57 +0100)]
Bug 7973- Allow for new type of LDAP authentication

This patch aims to solve the LDAP bind authentication method. Here are
some considerations:

- This is a standalone patch, so all the previous submitted ones are
  rendered obsolete;
- LDAP bind authentication is now done in 3 steps:
  1 - LDAP anonymous bind;
  2 - LDAP search entry for the given username;
  3 - LDAP bind with the DN of the found entry + the given password.
- The process fails if none or more than 1 entries are found for the
  given username;
- The <principal_name> setting in koha-conf.xml isn't used anymore;
- The patch is backwards compatible, so users already using the
  previously implemented LDAP bind authentication should be able to use
  it the same.

http://bugs.koha-community.org/show_bug.cgi?id=7973

Signed-off-by: Vitor Fernandes
Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script and has 2 solid sign offs.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9909' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 01:53:29 +0000 (21:53 -0400)]
Merge branch 'bug_9909' into 3.12-master

7 years agoBug 9909: Don't install KitchenSink plugin if plugin dir isn't writable
Jared Camins-Esakov [Sat, 23 Mar 2013 01:49:27 +0000 (21:49 -0400)]
Bug 9909: Don't install KitchenSink plugin if plugin dir isn't writable

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9907' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 21:50:17 +0000 (17:50 -0400)]
Merge branch 'bug_9907' into 3.12-master

7 years agoBug 9907 - Plugins test dies early on some servers
Kyle M Hall [Fri, 22 Mar 2013 21:31:15 +0000 (14:31 -0700)]
Bug 9907 - Plugins test dies early on some servers

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9890' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 20:54:11 +0000 (16:54 -0400)]
Merge branch 'bug_9890' into 3.12-master

7 years agoBug 9890 - Fix the new plugin system for package installs
Kyle M Hall [Fri, 22 Mar 2013 13:30:42 +0000 (06:30 -0700)]
Bug 9890 - Fix the new plugin system for package installs

Create the plugins directory in the Makefile

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
One line change, all ok.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9883' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 13:52:37 +0000 (09:52 -0400)]
Merge branch 'bug_9883' into 3.12-master

7 years agoBug 9883 - Koha::Plugins::* should not require koha-conf to load - Followup - Load...
Kyle M Hall [Fri, 22 Mar 2013 11:40:36 +0000 (04:40 -0700)]
Bug 9883 - Koha::Plugins::* should not require koha-conf to load - Followup - Load C4::Auth at run time

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Unset KOHA_CONF variable and made sure t/00_load.t passed
Also ran Makefile.PL doing an update on my existing installation
and checked koha-conf.xml:

 <pluginsdir>/home/katrin/koha-dev/var/lib/plugins</pluginsdir>
 <enable_plugins>0</enable_plugins>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 9883 - Add missing parameter to koha-conf.xml causing Plugins.t to fail
Kyle M Hall [Fri, 22 Mar 2013 09:08:02 +0000 (02:08 -0700)]
Bug 9883 - Add missing parameter to koha-conf.xml causing Plugins.t to fail

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 9883 - Koha::Plugins::Base should not require koha-conf to load
Kyle M Hall [Thu, 21 Mar 2013 08:35:16 +0000 (01:35 -0700)]
Bug 9883 - Koha::Plugins::Base should not require koha-conf to load

Test Plan:
1) Run t/db_dependent/Plugins.t
2) Apply patch
3) Re-run t/db_dependent/Plugins.t

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
The tests pass both before and after the patch. I can see no
ill effects on the functionality (tried uploading and
accessing the Kitchen Sink plugin).

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
After installing libmodule-bundled-files-perl from the
debian.koha-community.org I ran through Makefile.PL
updating my conf file successfully. Also all tests
and QA script pass now.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9257' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 12:25:21 +0000 (08:25 -0400)]
Merge branch 'bug_9257' into 3.12-master

7 years agoBug 9257: Increment version number
Jared Camins-Esakov [Fri, 22 Mar 2013 12:25:15 +0000 (08:25 -0400)]
Bug 9257: Increment version number

Database update for bug 9257 has been given version 3.11.00.113

7 years agoBug 9257 - Add "groups" to normal search pulldown
Kyle M Hall [Mon, 10 Dec 2012 18:58:16 +0000 (13:58 -0500)]
Bug 9257 - Add "groups" to normal search pulldown

This patch adds the ability to add groups to the library select
pulldown on the opac, if it is enabled.

Test Plan:
1) Apply patch
2) Run updatedatabase.pl
3) Go to Administration › Libraries and groups
4) Create a new group, or edit an existing one
5) Ensure the 'Show in search pulldown' checkbox is checked
6) Save the group
7) Enable OpacAddMastheadLibraryPulldown if it is not already enabled
8) Load the OPAC, try the group search from the libraries pulldown menu

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Yes! Now this works, and well.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_8365' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 11:58:22 +0000 (07:58 -0400)]
Merge branch 'bug_8365' into 3.12-master

7 years agoBug 8365: Increment version number
Jared Camins-Esakov [Fri, 22 Mar 2013 11:58:14 +0000 (07:58 -0400)]
Bug 8365: Increment version number

Database update for bug 8365 has been given version 3.11.00.112

7 years agoBug 8365: FIX Return issue values instead of item values
Jonathan Druart [Tue, 19 Mar 2013 13:41:52 +0000 (14:41 +0100)]
Bug 8365: FIX Return issue values instead of item values

Before this patch, the GetItemIssue routine returns items.renewals
instead of issues.renewals

Signed-off-by: Broust <jean-manuel.broust@univ-lyon2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 8365: Followup Force DateTime type for the datedue variable
Jonathan Druart [Tue, 19 Mar 2013 13:18:40 +0000 (14:18 +0100)]
Bug 8365: Followup Force DateTime type for the datedue variable

Signed-off-by: Broust <jean-manuel.broust@univ-lyon2.fr>
I tested one more time on a sandbox but I confirm the problem:
the due date doesn't change when you renew more than one time
with syspref renewalperiodbase turned on: "the old due date of
the checkout". The due date should change any time.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Added signed-off line and problem description from bugzilla.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 8365: Add unit tests and fix QA issues
Jonathan Druart [Wed, 13 Feb 2013 14:08:41 +0000 (15:08 +0100)]
Bug 8365: Add unit tests and fix QA issues

This patch adds some unit tests for CalcDateDue and GetLoanLength

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Tests done:
- Checked update works correctly for existing circulation rules.
- Adding, deleting and overwriting circulation rules works.
- Renewals work for different circulation rules and changes
  to the holiday calendar.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 8365: Add a renewal duration in the issuing rules
Jonathan Druart [Fri, 7 Sep 2012 14:31:44 +0000 (16:31 +0200)]
Bug 8365: Add a renewal duration in the issuing rules

Renew an issue for a number of days (filled in the issuing rules).

Test if rules work for any i[item]types and if there is no regression.

- new column issuingrules.renewalperiod
- remove all occurrences of an already removed syspref (globalDueDate)
- remove an unused routine (Overdues::GetIssuingRules)

How it works:
- On existing installations, the issuingrules.renewalperiod =
  issuingrules.loanlength. So the behaviour is the same before and after
  this patch.
- when you add a rule, you can choose a renewal period (the unit value
  is the issuingrules.unit). So you can have a renewal period in hours
  or days.
- The default value for the renewal period is 21 days (same as
  loanlength)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test comments on second patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoUpdate history with January and February 2013 releases
Jared Camins-Esakov [Fri, 22 Mar 2013 03:17:02 +0000 (23:17 -0400)]
Update history with January and February 2013 releases

7 years agoMerge branch 'bug_9496' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 02:25:09 +0000 (22:25 -0400)]
Merge branch 'bug_9496' into 3.12-master

7 years agobug 9496: improve error checking in rebuild_zebra.pl
Galen Charlton [Tue, 8 Jan 2013 00:12:57 +0000 (19:12 -0500)]
bug 9496: improve error checking in rebuild_zebra.pl

When using rebuild_zebra to index all records, skip over
bibliographic or authority records that don't come out
as valid XML.  Also, strip extraneous XML declarations when
using --nosanitize.

Test plans
----------
Note that both plans assume that DOM indexing is turned on.

Test plan #1
============

[1] Run rebuild_zebra.pl with the -x -nosanitize options.  Without
    the patch, zebraidx should terminate early and complain
    about invalid XML.
[2] With the patch, the rebuild_zebra.pl should work without
    error.

Test plan #2
============
[1] Intentionally make a MARCXML record invalid, e.g, by running
    the following SQL:

    UPDATE bilbioitems SET marcxml = CONCATENATE(marcxml, 'junk')
    WHERE biblionumber = 123;

[2] Run rebuild_zebra.pl -b -x -r
[3] Without the patch, only part of the database will be indexed.
[4] With the patch, rebuild_zebra.pl will not export the bad
    record and will give an error message saying so, but will
    successfully index the rest of the records.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Larry Baerveldt <larry@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_5608' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 02:16:16 +0000 (22:16 -0400)]
Merge branch 'bug_5608' into 3.12-master

7 years agobug 5608 follow-up: exit immediately if UNIMARC
Paul Poulain [Thu, 21 Mar 2013 15:55:07 +0000 (16:55 +0100)]
bug 5608 follow-up: exit immediately if UNIMARC

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoAdd license statement to switch_series_info CLI script
Michael Hafen [Mon, 25 Feb 2013 19:43:09 +0000 (12:43 -0700)]
Add license statement to switch_series_info CLI script

License and copyright statement added.
Thanks to Bernardo Gonzalez Kriegel for reminding me about this.

http://bugs.koha-community.org/show_bug.cgi?id=5608
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: add license information. No errors.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 5608 - command-line tool to switch information in 440 and 490 tags
Michael Hafen [Thu, 21 Feb 2013 22:44:00 +0000 (15:44 -0700)]
Bug 5608 - command-line tool to switch information in 440 and 490 tags

With the MARC21 standard moving from the 440 tag to the 490, this tool is
to help libraries make the move.  It switches any information in 440 tags to
490 tags, and any information in 490 tags to 440 tags.  That seemed like the
best way to go to me.  There is also an option to create 830 tags for any 44
information, like authorities, that can't be represented in the 490 tag.

To Test:
locate some biblios with 440 or 490 tags filled.
run bin/migration_tools/switch_marc21_series_info.pl -c
observe that the information in the biblios has switched 4xx tags.

http://bugs.koha-community.org/show_bug.cgi?id=5608
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 5608 - command-line tool to switch information in 440 and 490 tags
Michael Hafen [Wed, 20 Feb 2013 21:32:06 +0000 (14:32 -0700)]
Bug 5608 - command-line tool to switch information in 440 and 490 tags

With the MARC21 standard moving from the 440 tag to the 490, this tool is
to help libraries make the move.  It switches any information in 440 tags to
490 tags, and any information in 490 tags to 440 tags.  That seemed like the
best way to go to me.

To Test:
locate some biblios with 440 or 490 tags filled.
run bin/migration_tools/switch_marc21_series_info.pl -c
observe that the information in the biblios has switched 4xx tags.

http://bugs.koha-community.org/show_bug.cgi?id=5608
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works as described. No errors.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_8378' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 01:56:06 +0000 (21:56 -0400)]
Merge branch 'bug_8378' into 3.12-master

7 years agoBug 8378: Increment version number
Jared Camins-Esakov [Fri, 22 Mar 2013 01:55:14 +0000 (21:55 -0400)]
Bug 8378: Increment version number

Database update for bug 8378 has been given version 3.11.00.111

7 years agoBug 8378 - followup - update notices to use <<items.fine>>
Dobrica Pavlinusic [Wed, 20 Mar 2013 13:46:07 +0000 (14:46 +0100)]
Bug 8378 - followup - update notices to use <<items.fine>>

Didn't break on well-formed notices, and fixed those with problems

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 8378 - followup - sample_notices.sql updated to <<items.fine>>
Dobrica Pavlinusic [Wed, 20 Mar 2013 13:13:16 +0000 (14:13 +0100)]
Bug 8378 - followup - sample_notices.sql updated to <<items.fine>>

Trivial string substitution.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 8378 - show all items columns and new items.fine
Dobrica Pavlinusic [Tue, 19 Mar 2013 13:36:14 +0000 (14:36 +0100)]
Bug 8378 - show all items columns and new items.fine

This allows users to select any columns from items and adds new
items.fine field introduced by previous patch to user interface.

Note: This works as expected. items.fine appears as an option and gets inserted in the notice template as expected.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 8378 - <fine> in overdues changed to <<items.fine>>
Dobrica Pavlinusic [Tue, 19 Mar 2013 12:40:50 +0000 (13:40 +0100)]
Bug 8378 - <fine> in overdues changed to <<items.fine>>

This patch reintroduces fines in overdue_notices.pl with minimal
changes to exsiting code.

It DOES changes template syntax, it used to be <fine>USD</fine> but
currency was not recalculated and used only to select format, so
now we are using active system currency because values are in it
anyway.

Example notify template:

<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>,
Barcode: <<items.barcode>> Fine: <<items.fine>> </item>

If your active currency doesn't have valid ISO code this code will
fallback to sprintf with two decimal digits, and you can insert
currency symbol in template itself (currency field is not editable
through web interface, so this fallback might be useful for existing
installations).

Test scenario:
1. configure fine amount under "Circulation and fines rules"
   for patron category and item type
2. checkout item with correct type to partron in correct
   category with due date set to yesterday
3. verify that overdue notice uses new <<items.fine>> tag
4. run ./misc/cronjobs/fines.pl to calculate fines
5. run ./misc/cronjobs/overdue_notices.pl -n
   and verify that fine amount is included

Notes: Tested using the default ODUE notice, changing:
<fines>USD</fines>
for
<<items.fine>>

Everything worked as expected with finesmode=production set.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoRevert "Merge branch 'bug_8089' into 3.12-master"
Jared Camins-Esakov [Fri, 22 Mar 2013 01:06:30 +0000 (21:06 -0400)]
Revert "Merge branch 'bug_8089' into 3.12-master"

This reverts commit af89f98a7a82e098a5248c4f2d3c9ff3cd5de201, reversing
changes made to cc49dc70fbadb776360b1679616f81388ca71252.

The changes made by bug 8089 caused problems with the
t/db_dependent/Context.t unit test. Given the proximity of feature
freeze and release I am exercising my RM privilege and reverting rather
than seeking to fix the problems right this moment.

7 years agoMerge branch 'bug_8220' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 00:41:37 +0000 (20:41 -0400)]
Merge branch 'bug_8220' into 3.12-master

7 years agoBug 8220: Increment version number
Jared Camins-Esakov [Fri, 22 Mar 2013 00:41:12 +0000 (20:41 -0400)]
Bug 8220: Increment version number

Database update for bug 8220 has been given version 3.11.00.110

7 years agoBug 8220 - QA Followup - Unit Test
Kyle M Hall [Tue, 11 Dec 2012 19:47:44 +0000 (14:47 -0500)]
Bug 8220 - QA Followup - Unit Test

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and qa script pass.

Tests done:
- created a .koc file with return, issue and fine payments.
- queued that file into Koha
- created some transactions using the Firefox plugin
- queued that into Koha
- processed files and checked outcome was ok
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 8220 - Allow koc uploads to go to process queue instead of being applied directly.
Kyle M Hall [Sat, 9 Jun 2012 15:07:39 +0000 (11:07 -0400)]
Bug 8220 - Allow koc uploads to go to process queue instead of being applied directly.

The primary advantage to the Firefox offline cirulation plugin when compared
to the offline circulation desktop application, is the ability to add offline
circulation actions to a queue so that multiple machines running offline
circ can have their circ actions combined and ordered chronologically before
being executed. This commit adds the ability to put actions from uploaded
KOC files into this queue. In this way, both the FF plugina and the desktop
application can be run side by side with no ill effects.

Signed-off-by: Bob Birchall <bob@calyx.net.au>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_5635' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 00:21:58 +0000 (20:21 -0400)]
Merge branch 'bug_5635' into 3.12-master

7 years agoBug 5635: bulkmarcimport new parameters & features
Stéphane Delaune [Mon, 23 Jul 2012 08:49:31 +0000 (10:49 +0200)]
Bug 5635: bulkmarcimport new parameters & features

See the script's documentation for more details

New parameters are:
 - authtypes
 - filter
 - insert
 - update
 - all

Signed-off-by: Pascale Nalon <pascale.nalon@gmail.com>
This patch is live in Mines ParisTech since 2012-07-24.
Signing off

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
 - Moved the sign-off from bugzilla to the commit message.
 - All tests and QA script pass.
 - Amended commit message to list new parameters.
 - Verified this patch works on a UNIMARC installation.
 - Verified normal import still works correct on a MARC21
   installation.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_4354' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 00:08:17 +0000 (20:08 -0400)]
Merge branch 'bug_4354' into 3.12-master

7 years agoBug 4354 follow-up: correct phrasing of alert
Jared Camins-Esakov [Fri, 22 Mar 2013 00:04:09 +0000 (20:04 -0400)]
Bug 4354 follow-up: correct phrasing of alert

Rather than saying "Are you sure you want to lost your changes" the
message that pops up when a user cancels changes to an existing row
should be "Are you sure you want to cancel your changes?" or something
along those lines. I went with that exact string.

7 years agoBug 4354: Manage the specific case "Unlimited" value
Jonathan Druart [Thu, 21 Mar 2013 14:43:01 +0000 (15:43 +0100)]
Bug 4354: Manage the specific case "Unlimited" value

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All good :)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 4354: Followup: FIX the hardduedate copy
Jonathan Druart [Thu, 21 Mar 2013 11:32:43 +0000 (12:32 +0100)]
Bug 4354: Followup: FIX the hardduedate copy

Before this patch, the copy was based on the string (could be
translated!). Now is base on the -1, 0, 1 values.
The trick is to backup the hardduedatecompare value for each line of the
table.

Signed-off-by: Cedric Vita <cedric.vita@dracenie.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 4354: Followup Add a Cancel button
Jonathan Druart [Mon, 18 Mar 2013 11:41:56 +0000 (12:41 +0100)]
Bug 4354: Followup Add a Cancel button

New cancel button on the edit row.
Add a prevent message when editing a new row.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 4354 - Followup - Add row highlighting
Kyle M Hall [Thu, 24 Jan 2013 14:21:34 +0000 (09:21 -0500)]
Bug 4354 - Followup - Add row highlighting

Test plan:
* Click on a row to edit
* Note that the row is highlighted in orange

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests pass.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 4354: Cannot edit existing issuing rules
Jonathan Druart [Wed, 16 Jan 2013 15:51:13 +0000 (16:51 +0100)]
Bug 4354: Cannot edit existing issuing rules

This patch adds javascript which pulls the values from the
chosen row of data and populates the last row's form with
that data. Some changes have been made to the markup to
better accommodate this.

Possibly missing is some kind of visual feedback to the user
that the edit action is taking place in a different row from
where they clicked. Comments are especially welcomed on
this aspect of the interaction.

The original author of this patch is Owen Leonard <oleonard@myacpl.org>

Test Plan:
* Edit an existing circulation rule
* Delete a circulation rule
* Create a new circulation rule
* Create a new circulation rule that is a dup of an old one
and make sure that it still overwrites the old rule like before

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comments on last patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_8089' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 23:15:34 +0000 (19:15 -0400)]
Merge branch 'bug_8089' into 3.12-master

7 years agoBug 8089: Cache sysprefs with Koha::Cache::Object
Jared Camins-Esakov [Sun, 20 Jan 2013 01:28:58 +0000 (20:28 -0500)]
Bug 8089: Cache sysprefs with Koha::Cache::Object

This patch replaces the %sysprefs hash variable with a
Koha::Cache::Object-tied hash that allows the user to cache sysprefs
in memcached, fastmmap, or memory.

To test:
1) Enable the cache as described on bug 9434.
2) Try viewing some pages in the OPAC and staff client. If the syspref
   caching isn't working, you'll be redirected to the web installer
   (in the staff client) or be shown the maintenance page (in the OPAC).
3) Disable the cache by unsetting the CACHING_SYSTEM environment
   variable.
4) Try viewing some pages in the OPAC and staff client. If the syspref
   caching isn't working, you'll be redirected to the web installer
   (in the staff client) or be shown the maintenance page (in the OPAC).

Note that this will not improve performance. It does, however, eliminate
the problem of sysprefs not getting updated in all threads in
multi-threaded environments.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_8509' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 22:58:26 +0000 (18:58 -0400)]
Merge branch 'bug_8509' into 3.12-master

7 years agoBug 8509: allows the Expected status to be chosen back
Adrien Saurat [Thu, 20 Sep 2012 14:18:18 +0000 (16:18 +0200)]
Bug 8509: allows the Expected status to be chosen back

If a serial has been marked as received by mistake, it's now
possible to set it as an "Expected" serial again.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.

I did varoius tests on a subscription switching between the
different status (expected, arrived, late) and couldn't find
a bad side effect of this patch.

Note: The date arrived/date expected is not automatically reset,
but you can enter the date manually in the template, so I think
this could be handled in a separate bug.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9117' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 22:54:37 +0000 (18:54 -0400)]
Merge branch 'bug_9117' into 3.12-master

7 years agoBug 9117: Add imageurl to the list of parameters of AddAuthorisedValue
Julian Maurice [Thu, 21 Mar 2013 14:47:37 +0000 (14:47 +0000)]
Bug 9117: Add imageurl to the list of parameters of AddAuthorisedValue

and add unit test in t/db_dependant/Koha.t

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 9117 [Follow-up] Translatable string should be in double quotes
Julian Maurice [Mon, 18 Mar 2013 15:50:30 +0000 (15:50 +0000)]
Bug 9117 [Follow-up] Translatable string should be in double quotes

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Tests done:
- Created several reports fresh and using the new duplicate feature.
- Verified authorized values were created correctly and can be
  viewed from Administration > authorized values.
- Checked tabs and limiting on subgroups works correctly.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 9117 [Follow-up] Fix group and subgroup filtering
Julian Maurice [Mon, 18 Mar 2013 15:40:02 +0000 (15:40 +0000)]
Bug 9117 [Follow-up] Fix group and subgroup filtering

When a group code is contained in another group code (e.g. 'COD' and
'CODE'), filtering on the longest ('CODE') include reports of the
smallest ('COD').
Same problem for the subgroups.
This patch fixes this.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 9117 [Follow-up] Reports hierarchies management improvements
Julian Maurice [Thu, 22 Nov 2012 09:48:08 +0000 (10:48 +0100)]
Bug 9117 [Follow-up] Reports hierarchies management improvements

This patch avoid javascript bugs when user hasn't 'create_reports'
permission (last column is hidden in this case but <th> remains)
+ fix a typo 'selelcted' > 'selected'

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 9117 [Follow-up] Reports hierarchies management improvements
Owen Leonard [Wed, 21 Nov 2012 15:36:13 +0000 (10:36 -0500)]
Bug 9117 [Follow-up] Reports hierarchies management improvements

This patch corrects serveral markup errors in the template
introduced by this bug as well as previous patches: unescaped
ampersands, missing closing tags, typos.

To test, view various stages of the process of viewing or
creating guided reports and check the source for validity.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 9117: Reports hierarchies management improvements
Julian Maurice [Thu, 2 Aug 2012 14:03:32 +0000 (16:03 +0200)]
Bug 9117: Reports hierarchies management improvements

- Filter by groups using tabs
- Filter by subgroups using a dropdown list under each tab
- Allow to create new group and subgroups when building a new report or
  editing an existing report (no need to go through admin AV interface)

+ Possibility to duplicate a report (new link in the table)

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>
7 years agoMerge branch 'bug_9880' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 22:39:47 +0000 (18:39 -0400)]
Merge branch 'bug_9880' into 3.12-master

7 years agoBug 9880 - Updated control file for new dependencies
Robin Sheat [Wed, 20 Mar 2013 22:37:48 +0000 (11:37 +1300)]
Bug 9880 - Updated control file for new dependencies

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_7368' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 22:33:47 +0000 (18:33 -0400)]
Merge branch 'bug_7368' into 3.12-master

7 years agoBug 7368: POD doc in VirtualShelves.pm
Marcel de Rooy [Tue, 28 Feb 2012 14:33:33 +0000 (15:33 +0100)]
Bug 7368: POD doc in VirtualShelves.pm

Only moving/adding some documentation in VirtualShelves.pm.
Related to earlier changes in connection with report 7310.
Adding my own signoff, nothing to test here. Does Koha still work? :)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9879' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 22:30:12 +0000 (18:30 -0400)]
Merge branch 'bug_9879' into 3.12-master

7 years agoBug 9879 - Use DataTables on suggestions management page
Owen Leonard [Wed, 20 Mar 2013 19:50:05 +0000 (15:50 -0400)]
Bug 9879 - Use DataTables on suggestions management page

Replace the tablesorter plugin with the DataTables plugin on the
suggestions management page. Table sorting has been coverted from using
multiple specific IDs to a more efficient class-based selector.

Unrelated change: Prevent page-jumping when checkbox links are clicked.

To test, open the suggestions management page (Acquisitions ->
Suggestions). Confirm that table sorting, paging, and searching works
correctly.

Signed-off-by: Frederic Durand <frederic.durand@unilim.fr>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9403' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 16:02:26 +0000 (12:02 -0400)]
Merge branch 'bug_9403' into 3.12-master

7 years agoBug 9403: Increment version number
Jared Camins-Esakov [Thu, 21 Mar 2013 16:02:15 +0000 (12:02 -0400)]
Bug 9403: Increment version number

Database update for bug 9403 has been given version 3.11.00.109

7 years agobug 9403 tiny follow-up to validate podchecker
Paul Poulain [Thu, 21 Mar 2013 14:58:14 +0000 (15:58 +0100)]
bug 9403 tiny follow-up to validate podchecker

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 9403: Follow-up: Move "Type" in XSLT result list to match OPAC result list
Katrin Fischer [Thu, 17 Jan 2013 17:33:53 +0000 (18:33 +0100)]
Bug 9403: Follow-up: Move "Type" in XSLT result list to match OPAC result list

Moves the line starting with "Type:" upwards to show below the author line
like it is in the OPAC XSLT result list.

To test:
1) Make sure XSLTResultsDisplay and DisplayIconsXSLT are turned on.
2) Check that the line starting with "Type" is showing up below the title and 'by' lines.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 9403: Material type icons not showing for XSLT default view in intranet
Katrin Fischer [Thu, 17 Jan 2013 16:49:08 +0000 (17:49 +0100)]
Bug 9403: Material type icons not showing for XSLT default view in intranet

Implements the material type icons shown in the MARC21 XSLT result list
of the OPAC for the intrant result list.

Also adds the system preference DisplayIconsXSLT as an intranet analogue
for the OPAC system preference DisplayOPACiconsXSLT and corrects the
descriptions of both preferences in the syspref editor.

To test:
0) Run database update to add new system preference
1) Activate default XSLTResultsDisplay
2) Check the new system preference DisplayIconsXSLT shows up correctly
  and is activated by default. Compare descriptions between DisplayIconsXSLT
  and DisplayOPACiconsXSLT.
3) Check the intranet result list for icons showing up after 'Type:' and
  before the corresponding description. Detail pages should be showing
  the 'Type:' as before.
4) Turn off DisplayIconsXSLT.
5) Check the line containing 'Type:', format and audience information is now
  hidden from the result list.
6) Check that the 'Type:'line is also hidden from the detail page.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_7241' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 15:44:15 +0000 (11:44 -0400)]
Merge branch 'bug_7241' into 3.12-master

7 years agoBug 7241: Increment version number
Jared Camins-Esakov [Thu, 21 Mar 2013 15:44:08 +0000 (11:44 -0400)]
Bug 7241: Increment version number

Database update for bug 7241 has been given version 3.11.00.108

7 years agoBug 7241, follow-up: viewlog link for circulation
Adrien Saurat [Thu, 21 Mar 2013 15:05:27 +0000 (16:05 +0100)]
Bug 7241, follow-up: viewlog link for circulation

Fixes a few things about the CIRC link in viewlogs:
- "itemnumber=" instead of "item="
- anchor #item was filled with the wrong field
- tooltip now indicates "item" instead of "biblio"

Signed-off-by: Adrien Saurat <adrien.saurat@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 7241 follow-up: DB changes
Adrien Saurat [Thu, 21 Mar 2013 13:30:46 +0000 (14:30 +0100)]
Bug 7241 follow-up: DB changes

Reset timestamp modification on update after patch application.
Give more information about the log history fix.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 7241: circulation action logs record biblionumber instead of item number
Adrien Saurat [Tue, 22 Jan 2013 13:46:38 +0000 (14:46 +0100)]
Bug 7241: circulation action logs record biblionumber instead of item number

Issue log and and circulation logs are incorrectly recording biblionumber instead of item number, creating incorrect logs.
This patch corrects this, and modifies the action_logs table in two ways:
- the timestamp is not updated anymore with UPDATES (but still automatically filled when INSERTing)
- to partially correct the broken logs, the log history is filled with the first found item for each biblio

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>
7 years agoMerge branch 'bug_9014' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 15:08:38 +0000 (11:08 -0400)]
Merge branch 'bug_9014' into 3.12-master

7 years agoBug 9014: Increment version number
Jared Camins-Esakov [Thu, 21 Mar 2013 15:08:08 +0000 (11:08 -0400)]
Bug 9014: Increment version number

Database update for bug 9014 has been given version 3.11.00.107

7 years agoBug 9014 - Add time due to slips
Kyle M Hall [Tue, 6 Nov 2012 19:00:06 +0000 (14:00 -0500)]
Bug 9014 - Add time due to slips

This patch modifies Koha::DateUtils::output_pref to support the new system preference TimeFormat, which defines the visual format for a time as either the 24 hour format ( default ), or the 12 hour format (HH:MM AM/PM).

The patch also modifies C4::Members::IssueSlip to use output_pref rather than format_date.

Test Plan:
1) Apply patch
2) Run updatedatabase.pl
3) Issue an item to a patron, verify the times are in 24 hour format.
4) Switch TimeFormat to the 12 hour format.
5) Revisit the patron record you issued an item to, times should now be in a 12 hour format.
6) Print a slip for this patron, you should now see the time as well as the date.

Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests after fixing the test count in t/DateUtils.t.
Fixed conflicts in syspref.sql and updatedatabase.pl.

Signed-off-by: Cedric Vita <cedric.vita@dracenie.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
As we have another sign-off on this now I gave it a quick
run through and it works as expected.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9045' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 14:47:47 +0000 (10:47 -0400)]
Merge branch 'bug_9045' into 3.12-master

7 years agoBug 9045 - Adding some parameters to export_borrowers.pl
Sophie Meynieux [Mon, 18 Mar 2013 14:29:42 +0000 (15:29 +0100)]
Bug 9045 - Adding some parameters to export_borrowers.pl

Followup : Adding test if results has some records and usage example for
--where clause

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I infer from the bug comments that a proper test for this patch is to
check how the script reacts if it returns no results with a --where
clause, and to verify that there is a good usage example for the --where
option. These are both true, so I think this passes.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Tests done:
- tested -s option with \;
- tested -f surname -f borrowernumber to have multiple fields specified
- tested -w with "borrowernumber > 100" and similar with and without
  results - if no results a message is shown
- tested -h shows documentation for new options
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 9045 : Adding --where parameter to filter what kind of borrowers to export and...
Sophie Meynieux [Fri, 9 Nov 2012 17:02:33 +0000 (18:02 +0100)]
Bug 9045 : Adding --where parameter to filter what kind of borrowers to export and --separator to choose a specific caracter for patron export

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Tested, works as advertised. Note, to use tab character as a separater,
do this: -s $'\t'

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comments on second patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9769' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 14:11:18 +0000 (10:11 -0400)]
Merge branch 'bug_9769' into 3.12-master

7 years agoMerge branch 'bug_9718' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 13:57:23 +0000 (09:57 -0400)]
Merge branch 'bug_9718' into 3.12-master

7 years agoBug 9718 - Add POD and comments for Check_Userid and Generate_Userid subs
David Cook [Wed, 27 Feb 2013 04:26:08 +0000 (15:26 +1100)]
Bug 9718 - Add POD and comments for Check_Userid and Generate_Userid subs

Add plain English explanations in POD blocks for how the Check_Userid and Generate_Userid subs work.

Also add a comment explaining how the do loop works with the while condition in Generate_Userid, since the condition is worded awkwardly.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
String patch adding documentation.
POD test and other tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9764' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 13:55:20 +0000 (09:55 -0400)]
Merge branch 'bug_9764' into 3.12-master

7 years agoBug 9764 - Replace YUI buttons on authority search popup with Bootstrap
Owen Leonard [Thu, 7 Mar 2013 19:25:25 +0000 (14:25 -0500)]
Bug 9764 - Replace YUI buttons on authority search popup with Bootstrap

The authority search popup styles several buttons with YUI. Bootstrap
should be used instead.

This patch removes YUI styling from two buttons ("Submit" and "Cancel")
in favor of default styling for consistency's sake. The other buttons
("Clear field" and "Create new") have been moved to a standard toolbar
div and styled with Bootstrap.

Some inline JavaScript has been moved to the <script> tag in order to
eliminate undesirable javascript: pseudo-protocol links.

To test, open a bibliographic record for editing and click the authority
edit link next to a field with authority-linked data in it.
- Confirm that buttons in the popup window look correct.
- Confirm that the "Clear field" button clears the field in the MARC
  editor.
- Confirm that the "Create new authority" button launches a blank
  authority editor.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors.
All buttons works: look correct, clear works, create works.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Tests done according to test plan.

http://bugs.koha-community.org/show_bug.cgi?id=9765
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 9769 [Revised] Replace YUI buttons on acquisitions basket page with Bootstrap
Owen Leonard [Fri, 8 Mar 2013 14:46:13 +0000 (09:46 -0500)]
Bug 9769 [Revised] Replace YUI buttons on acquisitions basket page with Bootstrap

Toolbar buttons on the acquisitions basket page are constructed by YUI.
They should use Bootstrap instead.

Other minor changes: Fixes for invalid markup.

To test, view baskets in various states: Empty, open closed. View
baskets in groups and not in groups. Buttons should look correct and
work correctly:

- Edit
- Delete
- Close
- Reopen
- Export

Revision corrects check for 'skip_confirm_reopen' variable when
reopening baskets. Please test with BasketConfirmations both on and off.

Signed-off-by: Brendan <brendan@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested all options, some notes about behaviour:
- closing a basket is only possible, when there are no uncertain prices
  (no button close basket)
- reopening a basket requires, that you first remove the basket from
  any basket group (no button to reopen basket)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9771' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 13:47:08 +0000 (09:47 -0400)]
Merge branch 'bug_9771' into 3.12-master

7 years agoBug 9771 [Revised] Replace YUI buttons on acquisitions basket groups page with Bootstrap
Owen Leonard [Fri, 8 Mar 2013 15:43:45 +0000 (10:43 -0500)]
Bug 9771 [Revised] Replace YUI buttons on acquisitions basket groups page with Bootstrap

The acquisitions basket group page has a toolbar with YUI-generated
buttons and menus. It should use Bootstrap instead.

This patch removes the YUI menu buttons altogether, replacing that
functionality with the sidebar menu now included on other acquisitions
pages (See Bug 8913). The "New basket group" button is now styled by
Bootstrap.

Other minor changes: Corrections of invalid markup, improvement to
breadcrumbs.

To test, view the basket group page and confirm that the toolbar button
looks correct and works correctly. Confirm that navigation works and
that functionality of the basket group edit page is not affected.

Revision adds an explicit width to the basket-grouping form columns
so that they don't stretch too wide (and far from each other) when
the browser window is very wide. This better replicates the layout
of the previous version.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script happy.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9438' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 13:42:13 +0000 (09:42 -0400)]
Merge branch 'bug_9438' into 3.12-master

7 years agoFollow-up Bug 9438 - Biblio notes displayed when ordering
Bernardo Gonzalez Kriegel [Tue, 5 Feb 2013 19:23:40 +0000 (16:23 -0300)]
Follow-up Bug 9438 - Biblio notes displayed when ordering

This patch re-enables displying Notes when select
Modify order from basket view.

To Test:
1) After applying first patch, Notes are empty when select Modify order
2) Apply patch
3) Now Notes are visible again, unless the order is new.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 9438: biblio notes displayed when adding order
Adrien Saurat [Mon, 21 Jan 2013 11:13:41 +0000 (12:13 +0100)]
Bug 9438: biblio notes displayed when adding order

The biblio notes should not appear in the "Notes" textarea
of the "New order" page, in Acquisitions.

TEST PLAN
1) Find a biblio with a note (for example 300$a in UNIMARC, 500$a
in USMARC), or add a note to a biblio.

2) In a basket, create a new order for that title. Before the patch,
the "Notes" textarea contains the note from the biblio. After the patch
the textarea is empty.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9884' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 11:49:11 +0000 (07:49 -0400)]
Merge branch 'bug_9884' into 3.12-master

7 years agoBug 9884 - Plugin permissions not added to translations
Kyle M Hall [Thu, 21 Mar 2013 08:24:53 +0000 (01:24 -0700)]
Bug 9884 - Plugin permissions not added to translations

Test Plan:
1) Run xt/permissions.t, note the errors
2) Apply patch
3) Re-run xt/permissions.t, note the errors are gone

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9434' into 3.12-master
Jared Camins-Esakov [Wed, 20 Mar 2013 19:54:23 +0000 (15:54 -0400)]
Merge branch 'bug_9434' into 3.12-master

7 years agoBug 9434 follow-up: fix number of tests skipped when cache is disabled
Jared Camins-Esakov [Wed, 20 Mar 2013 19:50:37 +0000 (15:50 -0400)]
Bug 9434 follow-up: fix number of tests skipped when cache is disabled