koha.git
8 years agoBug 9406: ensure confirmation of patron renewal is displayed
Galen Charlton [Wed, 16 Jan 2013 17:38:28 +0000 (09:38 -0800)]
Bug 9406: ensure confirmation of patron renewal is displayed

When renewing a patron from the patron details page, ensure that
the "Patron's account has been renewed until XXX" is actually
displayed.

This patch introduces a was_renewed CGI and template parameter
to clarify the intent of the relevent template sections.

To test:

- Before applying the patch, renew a patron from the patron
  details page and verify that you don't see the renewal confirmation.
- After applying the patch, renew the patron from the details page
  and verify that the "Patron's account has been renewed until XXX"
  message shows up.
- Renew the patron from the checkout page and verify that the confirmation
  message shows up.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Message now displays for both tabs.
Fixed tab to make QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9002' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 01:14:32 +0000 (21:14 -0400)]
Merge branch 'bug_9002' into 3.12-master

8 years agoBug 9002 - Remove Problematic Logic from Patron Messaging Preferences Form
David Cook [Wed, 31 Oct 2012 21:17:08 +0000 (08:17 +1100)]
Bug 9002 - Remove Problematic Logic from Patron Messaging Preferences Form

If you do not have SMSSendDriver set and you do not have a message_transport_type of "sms", you will get an extra table column filled with a hyphen "-" and no corresponding table heading in the Patron Messaging Preferences table.

This pushes the table out of alignment so the email checkbox goes under "Digests Only?", the digests checkbox goes under "Do not notify", and the Do not notify checkbox is pushed to the side with no heading.

Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested for regressions.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9274' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 00:59:57 +0000 (20:59 -0400)]
Merge branch 'bug_9274' into 3.12-master

8 years agoBug 9274: Software error in bibtex export
Fridolyn SOMERS [Wed, 12 Dec 2012 14:47:55 +0000 (15:47 +0100)]
Bug 9274: Software error in bibtex export

Exporting to Bibtex from OPAC returns a software error.
This is because call to C4::Biblio::GetMarcAuthors does
not return only authors but also authority link.
This patch replaces this call by a direct read of
MARC::Record, like for other Bibtex datas.
C4::Biblio::GetMarcAuthors is really destinated to a
direct use in a template.
Also, actually all author subfields are joined with
'and'. According to Bibtext format, authors should be
"firstname surname and ..." or "surname, firstname and
...". I have choosen second one because in non-UNIMARC
it corresponds to $a content.

For example UNIMARC :
700 $aDoe $bJohn
700 $aDoe $bJanne
Gives : Doe, John and Doe, Janne
For example MARC21 :
700 $aDoe, John
700 $aDoe, Janne
Gives : Doe, John and Doe, Janne

Test plan :
Without patch :
Exporting to Bibtex from OPAC returns a software error.
With patch :
Exporting to Bibtex from OPAC succeeds.
Authors are composed using : $a, $b and ... for UNIMARC, $a ... for other marc flavours.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works as decribed. All record export that produces
error pre-patch, now export without error.
No koha-qa errors

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes error and output of additional authors.
Main entry in 100 is still missing.
All tests and  QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoAdd Aaron Wells to history as committer #207
Jared Camins-Esakov [Sun, 31 Mar 2013 00:41:00 +0000 (20:41 -0400)]
Add Aaron Wells to history as committer #207

8 years agoMerge branch 'bug_8816' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 00:40:17 +0000 (20:40 -0400)]
Merge branch 'bug_8816' into 3.12-master

8 years agoBug 8816: Add warning about manual edits to top of debian/control
Aaron Wells [Mon, 25 Mar 2013 04:24:59 +0000 (17:24 +1300)]
Bug 8816: Add warning about manual edits to top of debian/control

And we need to add it to control.in as well, because control is
created from control.in (which is the whole point of the warning ;)

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Adds comments with a warning.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9873' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 00:37:22 +0000 (20:37 -0400)]
Merge branch 'bug_9873' into 3.12-master

8 years agoBug 9873 - Quiet errors in the log from XSLT.pm
Owen Leonard [Wed, 20 Mar 2013 15:01:30 +0000 (11:01 -0400)]
Bug 9873 - Quiet errors in the log from XSLT.pm

If XSLTResultsDisplay is enabled and items in your search results lack a
shelving location or a ccode errors will appear in the log complaining
of "uninitialized value in hash element." This patch adds a check on
these values to quiet the errors.

To test, find or create a record with items which have no shelving
location and/or no collection code. Perform a search the results for
which will include your record. Check for errors in the log.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Cleans up logs for result list quite a bit.
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9882' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 00:33:58 +0000 (20:33 -0400)]
Merge branch 'bug_9882' into 3.12-master

8 years agoBug 9882 - Use DataTables on batch modifications pages
Owen Leonard [Thu, 21 Mar 2013 13:31:39 +0000 (09:31 -0400)]
Bug 9882 - Use DataTables on batch modifications pages

The batch modification pages (edit and delete) use the old tablesorter
plugin. They should use DataTables instead. This patch makes the
following changes:

- Remove tablesorter plugin from batchMod.tt where it was unused.
- Replace tablesorter assets with DataTables assets on batch edit and
  batch delete pages.
- Replace tablesorter code with DataTables code in batchMod.js, which
  provides table sorting functionality for both batch templates.
- Move position of batchMod.js script inclusion so that DataTables
  assets are loaded first.
- Remove inline table sorting code from batch edit page since it is
  provided by batchMod.js

To test, load barcodes on both the batch edit and batch delete pages.
Test JavaScript-based functionality on each results page:

- Check/Uncheck all
- Hide/show columns
- Table sorting on a variety of different kinds of data columns

Batch operations should complete normally.
There should be no JavaScript error on the batch operation "landing
page" (batchMod.tt).

Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Checked both patches, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9685' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 21:30:38 +0000 (17:30 -0400)]
Merge branch 'bug_9685' into 3.12-master

8 years agoBug 9685: Allow sort baskets by number
Fridolyn SOMERS [Thu, 21 Feb 2013 14:55:11 +0000 (15:55 +0100)]
Bug 9685: Allow sort baskets by number

In acqui/booksellers.pl, first column of baskets tables is "name (#number)".
This allows to sort by name but not by numnber.

This patch splits acutal first column into 2 columns number and name to
allow sorting on number.
Sets default sort on name like existing.

Test plan:
Look at page and use sorting on name and number columns.

Signed-off-by: Marc Sabin <marc.sabin@sciencespo-grenoble.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Nice change for better usability.
Sorting of both columns works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoAdd Karam Qubsi as 206th committer to history
Jared Camins-Esakov [Sat, 30 Mar 2013 21:26:19 +0000 (17:26 -0400)]
Add Karam Qubsi as 206th committer to history

8 years agoMerge branch 'bug_9956' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 21:25:50 +0000 (17:25 -0400)]
Merge branch 'bug_9956' into 3.12-master

8 years agoBug 9956 : Add translators to the about page
Karam Qubsi [Sat, 30 Mar 2013 18:43:44 +0000 (21:43 +0300)]
Bug 9956 : Add translators to the about page

Hi all this patch is adding the translators for Arabic version. Thanks a lot . Karam Qubsi

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
String change, looks fine.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9697' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 21:23:04 +0000 (17:23 -0400)]
Merge branch 'bug_9697' into 3.12-master

8 years agoBug 9697: Follow-up - making QA script and tests happy
Katrin Fischer [Sat, 30 Mar 2013 20:48:27 +0000 (21:48 +0100)]
Bug 9697: Follow-up - making QA script and tests happy

- 2x single quotes for translated string in edit-batch.tt

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9697 - Replace YUI buttons on the patron cards batch edit page with Bootstrap
Owen Leonard [Fri, 22 Feb 2013 15:26:53 +0000 (10:26 -0500)]
Bug 9697 - Replace YUI buttons on the patron cards batch edit page with Bootstrap

The patron card creator's batch edit page uses an include file to
display buttons styled by YUI. Bootstrap should be used instead.

This patch moves the contents of the include file into the main
template, this being the only page which requires it. YUI markup and
code has been removed and Bootstrap markup is added. The include file is
deleted.

To test, edit a batch of patrons in the patron card creator. Each
toolbar button should look correct and work correctly:

- Add item(s)
- Remove item(s)
- Delete batch
- Remove duplicates (Keeping Bug 9535 in mind)
- Export item(s)
- Export batch

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: all buttons works and look well. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Will fix some smaller things in a QA follow up.
Works as expected.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9904' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 21:19:17 +0000 (17:19 -0400)]
Merge branch 'bug_9904' into 3.12-master

8 years agoBug 9904 - Link to plugins management should not be in global navigation
Owen Leonard [Fri, 22 Mar 2013 15:34:18 +0000 (11:34 -0400)]
Bug 9904 - Link to plugins management should not be in global navigation

With the addition of the Plugins feature a link was added to the global
navigation in the "More" submenu. I think this is unnecessary. The
global navigation should be limited to primary Koha functons.

This patch removes the link. To test, apply the patch and confirm that
there is no longer a link to Plugins in the header navigation under
"More."

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template patch, works as advertised.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9932' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 21:15:09 +0000 (17:15 -0400)]
Merge branch 'bug_9932' into 3.12-master

8 years agoBug 9932 - Broken calendar image and misplaced masthead include for CCSR theme
ByWater Migration Support [Tue, 26 Mar 2013 16:17:15 +0000 (09:17 -0700)]
Bug 9932 - Broken calendar image and misplaced masthead include for CCSR theme

Test Plan:
1) Enable CCSR theme
2) View opac-reserve.pl
3) Note the misplaced background and the broken calendar images
4) Apply the patch
5) Note the background and images now display correctly

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Corrects path to calendar icon.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9945' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 21:10:41 +0000 (17:10 -0400)]
Merge branch 'bug_9945' into 3.12-master

8 years agoBug 9945: Changed display: inline to inline-block on the inline CSS styling on the...
Jonathan Druart [Thu, 28 Mar 2013 14:37:26 +0000 (15:37 +0100)]
Bug 9945: Changed display: inline to inline-block on the inline CSS styling on the li elements.

When adding/modifying an authorised values.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Improves icon set display in authorised value configuration.
CSS only.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9953' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 21:08:29 +0000 (17:08 -0400)]
Merge branch 'bug_9953' into 3.12-master

8 years agoBug 9953 - When OpacMaintenance breaks lifting debarment
Fridolyn SOMERS [Fri, 29 Mar 2013 12:08:05 +0000 (13:08 +0100)]
Bug 9953 - When OpacMaintenance breaks lifting debarment

When OpacMaintenance is on, any opac page will redirect to maintenance.pl.
Some pages of intranet have the same behavior and you get 404 error.
This is because in checkauth, if type arg is undefined it is "opac" by default.

This patch adds type arg in all intranet calls of checkauth.

Test plan :
- Set syspref OpacMaintenance=Show
- Go to a borrower page
- Click on "Fines" and "Create manual invoice"
- Enter an amount and save
=> Check you go to members/boraccount.pl and not maintenance.pl with 404 error

OK

- Click on "Fines" and "Create manual credit"
- Enter an amount and save
=> Check you go to members/boraccount.pl and not maintenance.pl with 404 error

OK

- Edit borrower
- Set "Restricted" to yes and save
- Click on "Lift restriction" in messages
=> Check you keep in member page and not maintenance.pl with 404 error

OK

- Edit borrower
- Set "Expiry date" to a day in the past and save
- Click on "Renew" in messages
=> Check you keep in member page and not maintenance.pl with 404 error

OK

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Good catch, a tricky bug.
http://bugs.koha-community.org/show_bug.cgi?id=9952

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Removed a few tabs from mancredit.
All tests and QA script pass now.
Good test plan.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9937' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 21:05:18 +0000 (17:05 -0400)]
Merge branch 'bug_9937' into 3.12-master

8 years agoBug 9937: Add new unit tests for new routines (introduced by bug 5343)
Jonathan Druart [Wed, 27 Mar 2013 14:14:26 +0000 (15:14 +0100)]
Bug 9937: Add new unit tests for new routines (introduced by bug 5343)

New unit tests for 4 routines:
- C4::Serials::subscriptionCurrentlyOnOrder
- C4::Acquisition::GetLastOrderNotReceivedFromSubscriptionid
- C4::Acquisition::GetLastOrderReceivedFromSubscriptionid
- C4::Budgets::GetBudgetName

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed a tab in t/db/dependent/Budgets.t
All tests, new db_dependent tests and QA script pass. Thx Jonathan!
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9928' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 20:59:04 +0000 (16:59 -0400)]
Merge branch 'bug_9928' into 3.12-master

8 years agoBug 9928 - no way to see all purchase suggestions at all
Kyle M Hall [Tue, 26 Mar 2013 13:58:57 +0000 (09:58 -0400)]
Bug 9928 - no way to see all purchase suggestions at all

Test Plan:
1) Apply patch
3) Create suggestions for multiple libraries
2) Select 'Any' for the 'For' field under 'Acquisition information'
3) Note you are seeing the suggestions for all branches

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

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes wrong behaviour.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9610' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 12:46:18 +0000 (08:46 -0400)]
Merge branch 'bug_9610' into 3.12-master

8 years agoBug 9610 - Spanish translation of MARC21 default bibliographic framework
Bernardo Gonzalez Kriegel [Wed, 13 Feb 2013 20:33:08 +0000 (17:33 -0300)]
Bug 9610 - Spanish translation of MARC21 default bibliographic framework

This (large) patch adds spanish translation to default
MARC21 bibliographic frameworks.

Based on final EN default framework of Bug 5858,
strings from http://www.bne.es/es/Micrositios/Guias/Marc21/index.html

Automated substitution of strings, to change as
little as possible the original file and ensure
that no entry is removed.

Only to new installs.

To test
1) Delete default framework.
2) Load installer/data/mysql/es-ES/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
   into database. Must load without errors.
3) Edit a record y choose default framework, legends must be in spanish
   (save for obsoleted fields, left untranslated on pourpose)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
SQL changes only.
Dropped my database and ran the Spanish web installer with
all sample files. No errors and frameworks in Koha look fine.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9745' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 12:26:05 +0000 (08:26 -0400)]
Merge branch 'bug_9745' into 3.12-master

8 years agoBug 9745 - don't nuke translated strings in permissions on DB upgrade
Liz Rea [Mon, 4 Mar 2013 22:39:54 +0000 (11:39 +1300)]
Bug 9745 - don't nuke translated strings in permissions on DB upgrade

To test:

(this is best done by someone who has a database with translated
strings for user permissions - I'm looking towards Katrin. :))

Get a 3.6-3.8 era database loaded as test data - also please use
a low value test database.

Translate or change the strings in the database for the user
permissions that follow in mysql client (for those who didn't
install with a different language that has translated files
at install time) -

update userflags set flagdesc="Translated text 1" where flag
IN('catalogue','editauthorities','reports','management','serials',
'updatecharges','circulate','parameters','borrowers','tools',
'staffaccess','edit_patrons');
(you will notice that this changes all of the permission labels
in the interface to "translated text 1" for the affected
permission flags. This is why I don't want you to use a high
value test database.)

Update that to master + this patch - your "translations"
should be intact.

Blow that database away, and make a brand new one 3.6-3.8 era
with the english database definitions. Run the update again with
this patch, the strings should be updated correctly.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
There was a typo in the patch, the first database update had to be
changed from this: $dbh->do{(q{ to this: $dbh->do(q{

* Test 1:
- git checkout v3.06.05
- Run through the web installer in Norwegian, installing all
  Norwegian sample data
- git checkout <master + patch for bug 9745>
- Run web installer/upgrade
- Almost all of the permissions are still in Norwegian. The ones
  that are in English are not touched by the database update for
  3.11.00.016, so they must have been introduced by other updates.

* Test 2:
- git checkout v3.06.05
- Run through the web installer in English, installing all English
  sample data
- git checkout <master + patch for bug 9745>
- Run web installer/upgrade
- All permissions have been updated as expected, except "Perform
  batch modification of patrons" which is not in the 'userflags'
  table, but in the 'permissions' table. I have amended the patch
  to account for this.

Two fixes to the original patch, please give a shout if this
makes a second signoff necessary!

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I tested this on an English and a German sample base updating
from 3.06.07 successfully.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Corrected incorrect field names in the last query (it's
permissions.description not permissions.flagdesc).

8 years agoUpdate history adding Jen Zajac as 205th committer
Jared Camins-Esakov [Sat, 30 Mar 2013 12:18:55 +0000 (08:18 -0400)]
Update history adding Jen Zajac as 205th committer

8 years agoMerge branch 'bug_5648' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 12:17:34 +0000 (08:17 -0400)]
Merge branch 'bug_5648' into 3.12-master

8 years agoBug 5648: Changed display: inline to inline-block on the inline CSS styling on the...
Jen Zajac [Mon, 25 Mar 2013 03:49:36 +0000 (16:49 +1300)]
Bug 5648: Changed display: inline to inline-block on the inline CSS styling on the li elements.

Signed-off-by: Frédéric Durand <frederic.durand@unilim.fr>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_8508' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 12:14:41 +0000 (08:14 -0400)]
Merge branch 'bug_8508' into 3.12-master

8 years agoBug 8508: Followup: Simplify the separateData js function
Jonathan Druart [Thu, 13 Sep 2012 08:20:56 +0000 (10:20 +0200)]
Bug 8508: Followup: Simplify the separateData js function

I think this patch does the same job as previously.
+ It replaces tabulation characters with 4 spaces

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>
8 years agoBug 8508 - Holds to Pull : Library dropdown options are erroneously concatenated...
David Cook [Mon, 10 Sep 2012 21:18:54 +0000 (07:18 +1000)]
Bug 8508 - Holds to Pull : Library dropdown options are erroneously concatenated by br tags

This patch introduces a new javascript function that breaks apart option
strings that are erroneously concatenated by br tags. The split strings
are then checked against non-concatenated option strings, and pushed into
the option array if there is no duplication.

This function is nestled into the JQuery datatable function for populating
the drop-down menu.

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>
8 years agoMerge branch 'bug_9003' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 12:11:38 +0000 (08:11 -0400)]
Merge branch 'bug_9003' into 3.12-master

8 years agoBug 9003 follow-up: add fix to CCSR
Jared Camins-Esakov [Sat, 30 Mar 2013 12:10:48 +0000 (08:10 -0400)]
Bug 9003 follow-up: add fix to CCSR

em strong, strong em CSS copied from dcook's original patch to CCSR.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9003 - Add css fix for opac items with strong and em
David Cook [Wed, 31 Oct 2012 22:26:41 +0000 (09:26 +1100)]
Bug 9003 - Add css fix for opac items with strong and em

Currently, if you have nested strong and em tags in the opac, you will only get the properties of the inner tag. This seems to be due to reset-fonts-grids.css resetting the font weight and style (for both strong and em) to normal.

So if you have strong as your outer tag and em as your inner tag, you'll have italics but no bold.

To test:

Before applying the patch...

1) Put <em> and <strong> tags around some text in the opacnav, opac news, opacheader, or any other area of the opac where you can enter html text.
2) Look at the opac and notice that only the inner tag styles are being applied to the text

Apply the patch

3) Refresh the opac (you may need to bypass or clear your browser cache for the new style to pick up)
4) Note that both the inner and outer <em> and <strong> tags are being applied to the text (i.e. your text should be bold and italicized)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Small change that works. No errors.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9196' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 12:07:04 +0000 (08:07 -0400)]
Merge branch 'bug_9196' into 3.12-master

8 years agoBug 9196 - authorities editor overlapping box
Owen Leonard [Tue, 12 Mar 2013 19:43:52 +0000 (15:43 -0400)]
Bug 9196 - authorities editor overlapping box

This patch corrects a display problem in the authorities editor which
can cause the contents of a tab to overflow outside the tab's boundary.

To test open an authority record for editing. Confirm that tab contents
do not overflow their bounds on both tabs with many lines and tabs with
just one or two.

Signed-off-by: Pierre Angot <tredok.pierre@mail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9419' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 12:03:11 +0000 (08:03 -0400)]
Merge branch 'bug_9419' into 3.12-master

8 years agoBug 9419: The highlight feature can cause a browser freeze
Jonathan Druart [Thu, 17 Jan 2013 15:52:18 +0000 (16:52 +0100)]
Bug 9419: The highlight feature can cause a browser freeze

Test plan:
- switch on the OpacHighlightedWords syspref
- search at the opac and intranet a string with a space (e.g.
  au,wrdl:"Shakespeare,  William" note the double space after the comma)
- without the patch your browser will be frozen during a few seconds,
  after applying it, the highlight works better.

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>
8 years agoMerge branch 'bug_9720' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 02:59:29 +0000 (22:59 -0400)]
Merge branch 'bug_9720' into 3.12-master

8 years agoBug 9720 : uninitialized value warnings in circulation (followup 1)
Fridolyn SOMERS [Wed, 27 Feb 2013 14:37:39 +0000 (15:37 +0100)]
Bug 9720 : uninitialized value warnings in circulation (followup 1)

This patch corrects several uninitialized value errors.

Test plan:
- Edit a borrower
- Enter a surname using lowercase (it will be displayed uppercase by CSS) and save
=> Borrower surname is uppercase
- Edit an organisation (depends on borrower category)
- Enter a surname using lowercase (it will be displayed uppercase by CSS) and save
=> Borrower surname is uppercase
- Go to a borrower page who has today issues
- Click on More/Export today's checked in barcodes
=> You get a file to dowload

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9720 : uninitialized value warnings in circulation
Fridolyn SOMERS [Wed, 27 Feb 2013 14:02:49 +0000 (15:02 +0100)]
Bug 9720 : uninitialized value warnings in circulation

This patch corrects several uninitialized value errors.

Test plan:
- Go to check out page
- Check that issues and old issues are in different tables
- Check that author is diplayed if exists
- Check that patron address is displayed if exists
- Perform a checkout

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9759' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 02:48:55 +0000 (22:48 -0400)]
Merge branch 'bug_9759' into 3.12-master

8 years agoBug 9759: last subfield can be deleted
Fridolyn SOMERS [Thu, 7 Mar 2013 10:54:57 +0000 (11:54 +0100)]
Bug 9759: last subfield can be deleted

In authorities and biblios editors, a repeatable subfield can be deleted (small icon next to input).
Clone subfields are really deleted but last existing subfield is just set empty instead of deleted.
But when same field is repeated, the last subfield can be deleted.

This patch corrects this, last subfield of a field, even repeated, can not be deleted.

Test plan :
- Edit a biblio
- Choose a repeatable field with a repeatable subfield : ie 600 and $x
- Edit 600, enter a text in $x : ie "subA"
- Clone $x
- Delete second $x
=> second $x is deleted
- Delete first $x
=> $x is not deleted but set empty
- Edit 600, enter a text in $x : ie "subA"
- Clone 600
- Edit second 600, enter a text in $x : ie "subB"
- Clone $x of second 600
- Delete second $x of second 600
=> second $x of second 600 is deleted
- Delete first $x of second 600
=> with this patch : first $x of second 600 is set empty
=> without this patch : first $x of second 600 is deleted, second 600 has no $x anymore
Perform same test plan on an authority.

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>
8 years agoMerge branch 'bug_9803' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 02:44:23 +0000 (22:44 -0400)]
Merge branch 'bug_9803' into 3.12-master

8 years agoBug 9803 - question mark in cataloging not clearly a link
Owen Leonard [Wed, 20 Mar 2013 18:37:40 +0000 (14:37 -0400)]
Bug 9803 - question mark in cataloging not clearly a link

When you hover your mouse over the MARC tag help link in cataloging the
cursor doesn't change to a standard link pointer because the <a> tag has
no "href" attribute. This patch adds a dummy href, "#" so that the
cursor will treat it as a link.

To test, apply the patch and load the MARC editor with a blank or
existing record. The "Show MARC tag documentation links" checkbox
must be checked. Hover your mouse over a "?" link in any tag. The
cursor should change to a pointer like it does on other links.

Signoff comment: The patch works as expected. Besides the cursor change,
links still work on every tab.

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>
8 years agoMerge branch 'bug_9922' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 02:25:28 +0000 (22:25 -0400)]
Merge branch 'bug_9922' into 3.12-master

8 years agoBug 9922 - holds queue shows home library with AutomaticReturn
Kyle M Hall [Mon, 25 Mar 2013 13:34:33 +0000 (09:34 -0400)]
Bug 9922 - holds queue shows home library with AutomaticReturn

Test Plan:
 1) Enable AutomaticItemReturn
 2) Place a reserve on a record where the holding and home branches differ
    for the available items
 3) Rebuild the holds queue
 4) Check the holds queue, verify the item is listed in the items to pull for the item's home branch
 5) Disable AutomaticItemReturn
 6) Rebuild the holds queue
 7) Verify the item is listed in the items to pull for the item's holding branch
 8) Enable AutomaticItemReturn
 9) Apply patch
10) Rebuild the holds queue
11) Verify the item is listed in the items to pull for the item's holding branch

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Tested per plan, and the patch seems sane. Functionality of the hold queue is restored to previous behaviour.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Amended test plan to make clear it has to be a record level
hold for the test plan to work.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9935' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 01:58:55 +0000 (21:58 -0400)]
Merge branch 'bug_9935' into 3.12-master

8 years agoBug 9935 - Social icons missing in CSSR theme
Fridolyn SOMERS [Wed, 27 Mar 2013 10:05:06 +0000 (11:05 +0100)]
Bug 9935 - Social icons missing in CSSR theme

When using CSSR theme, opac.css is missing css rules for social networks Facebook, LinkedIn ...

This patch copies css rules related to social netxork from prog theme to cssr theme.
Also copies social-sprite.png image.

Test plan :
- Set CSSR theme : syspref opacthemes=ccsr and opaccolorstylesheet=colors.css
- Set syspref SocialNetworks=Enable
- Go to a detail page at OPAC
=> check that social links are icons : Facebook, LinkedIn, Delicious, Send by email, Google Plus and Tweeter

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Social icons now showing, thanks!

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_7938' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 01:53:45 +0000 (21:53 -0400)]
Merge branch 'bug_7938' into 3.12-master

8 years agoBug 7938: Added description of -v/--verbose parameter
Will Stokes [Mon, 25 Mar 2013 04:07:02 +0000 (17:07 +1300)]
Bug 7938: Added description of -v/--verbose parameter

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
"perldoc misc/translator/translate" looks good and now mentions
the -v option.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9660' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 01:49:23 +0000 (21:49 -0400)]
Merge branch 'bug_9660' into 3.12-master

8 years agoBug 9660 follow-up: OpenLibrary covers are too small in CCSR too
Jared Camins-Esakov [Sat, 30 Mar 2013 01:48:15 +0000 (21:48 -0400)]
Bug 9660 follow-up: OpenLibrary covers are too small in CCSR too

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9660 - OpenLibrary covers are too small on OPAC search results
Mason James [Tue, 19 Feb 2013 03:24:15 +0000 (16:24 +1300)]
Bug 9660 - OpenLibrary covers are too small on OPAC search results

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Works as advertised. OpenLibrary book cover API offers 3 cover sizes: small,
medium, and large. Switch from small to medium, for result page, with
downsizing.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Improves display of OpenLibrary covers in OPAC result list.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9797' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 01:44:08 +0000 (21:44 -0400)]
Merge branch 'bug_9797' into 3.12-master

8 years agoBug 9797 - Follow up : use double quotes in javascript translatable strings
Fridolyn SOMERS [Fri, 22 Mar 2013 10:13:26 +0000 (11:13 +0100)]
Bug 9797 - Follow up : use double quotes in javascript translatable strings

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9797 - Untranslatable strings have returned to ajax.js
Owen Leonard [Tue, 12 Mar 2013 00:44:00 +0000 (20:44 -0400)]
Bug 9797 - Untranslatable strings have returned to ajax.js

The patch for Bug 8942 undid the changes to ajax.js made by Bug 9331.
This patch puts those changes back.

To test that preference-related error messages continue to work,
open the system preferences editor in two tabs. Log out in one tab and
try to save a system preference in the other. You should see correct
error messages.

Signed-off-by: Pierre Angot <tredok.pierre@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9926' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 01:39:29 +0000 (21:39 -0400)]
Merge branch 'bug_9926' into 3.12-master

8 years agoBug 9926 - Missing perl modules in Koha
Mason James [Tue, 26 Mar 2013 06:48:03 +0000 (19:48 +1300)]
Bug 9926 - Missing perl modules in Koha

To test:

1) check perl syntax on file
     $ perl -cw ./misc/migration_tools/koha-svc.pl

     you should *not* get 'syntax OK' returned from command

2) apply patch, and install File::Slurp module
      $ sudo cpanm File::Slurp

3) check perl syntax on file
      $ perl -cw ./misc/migration_tools/koha-svc.pl

      you should now get 'syntax OK' returned from command

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Without File:Slurp 1) complains of missing module,
with module then sintax Ok.
No errors.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Changed module from required to optional. The two files in which
it is used are extraneous from the viewpoint of the average user.

8 years agoMerge branch 'bug_9908' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 01:29:21 +0000 (21:29 -0400)]
Merge branch 'bug_9908' into 3.12-master

8 years agoBug 9908 - Fixing OCLC Connexion Client
Thatcher Rea [Fri, 22 Mar 2013 21:51:15 +0000 (10:51 +1300)]
Bug 9908 - Fixing OCLC Connexion Client

Fix issue where exporting a bib from the OCLC Connexion client
or web interface to a Koha database would always result in
an "Unsuccessful request" error.

To Test:

[1] Apply patch
[2] Start the Connexion import daemon.
[3] Start the Connexion client or web interface (requires that you
    you posses OCLC cataloging credentials).
[4] Locate a bib and use Connexion to export it to the Koha database.
[5] Verify that the bib is successfully added.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Logical change and trusting sign off here as I don't have
access to WorldCat for testing this.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9923' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 01:28:10 +0000 (21:28 -0400)]
Merge branch 'bug_9923' into 3.12-master

8 years agoBug 9923: (MT #11060) actual cost not getting populated
Christophe Croullebois [Mon, 18 Mar 2013 17:46:03 +0000 (18:46 +0100)]
Bug 9923: (MT #11060) actual cost not getting populated

The patch 7129 introduces a bug if the unitprice is 0.0000.
Instead of showing in this case the 'ecost' if there is not 'unitprice',
it shows 0.00 and the 'Actual cost' must be manually entered. The line:
if ( @$results[0]->{'unitprice'} == 0 ) {
    @$results[0]->{'unitprice'} = '';

was wrote in this perspective.
But sprintf ( "%.2f", with '' or 0 or any string will return 0.00
and then, in the .tt 'unitprice' exists so we have the bad result.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9930' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 01:09:49 +0000 (21:09 -0400)]
Merge branch 'bug_9930' into 3.12-master

8 years agoMerge branch 'bug_9783' into 3.12-master
Jared Camins-Esakov [Thu, 28 Mar 2013 02:58:19 +0000 (22:58 -0400)]
Merge branch 'bug_9783' into 3.12-master

8 years agoBug 9783 - can hit submit twice when adding patrons
David Cook [Mon, 11 Mar 2013 04:08:39 +0000 (15:08 +1100)]
Bug 9783 - can hit submit twice when adding patrons

Currently, clicking twice or more on the Save button will generate
duplicate patrons when adding patrons in the Patron module. Of course,
there is handling that detects this, so you can choose to either edit
the original record (i.e. throw away the duplicate) or create a
duplicate record.

However, it shouldn't get to that point by clicking on the Save button.
That handling seems to be there to handle cases where you go through the
whole process of trying to add a new patron only to find out that they
already exist in the system (or at least their username/password do).

--

This patch uses the "preventDoubleFormSubmit" function (which is also
used in holds and fines to prevent double form submits). It was also
necessary to edit members.js, since "check_form_borrowers" was forcing
form submits despite the "preventDoubleFormSubmit" function. I've
changed it from forcing a document.form.submit to return true, which the
browser will still submit the form if it's a unique borrower, but the
"preventDoubleFormSubmit" function will still prevent multiple submits.

I've also added a "waiting" class to staff-global.js which changes the
cursor to "wait" (i.e. loading circle graphic). I've included an
"AddClass" call in "preventDoubleFormSubmit", so that the cursor graphic
will change to show users that the page is loading so that they don't
click Save again. Of course, even if they do click save again, there
will only be one submit. However, this way - as Chris Cormack mentioned
- the user knows that "something" is happening and that the form isn't
broken.

-------
Test Plan

Before applying patch...

1) Fill out the form for a new patron in the Patron module
2) Click "Save" several times
3) Once the page loads, you'll be shown a prompt that says that this
   borrower already exists. You will have the option to view the
   original record, edit the original record, or create a new patron
   anyway
4) Click on edit the existing record, and delete the patron

Apply the patch

5) Repeat steps 1 and 2
6) Notice that your cursor has changed into a little "loading" circle
   graphic when you hover over the "body" of the page, as well as any
   links or any inputs/buttons of the type "submit" within that form
7) Notice that no matter how many times you press the button, the form
   is not re-submitted. Eventually you will be taken to the new patron's
   record (no mention of duplication will occur)

Ta da! Multiple form submits are prevented and the loading graphic
signals to users that the form was submitted and that Koha is processing
their data

--

I understand that some people might want to change which elements are
given the "waiting" class. I'm happy to renegotiate this as necessary.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Looks good and works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9881' into 3.12-master
Jared Camins-Esakov [Thu, 28 Mar 2013 02:45:16 +0000 (22:45 -0400)]
Merge branch 'bug_9881' into 3.12-master

8 years agoBug 9881 - Remove unused tablesorter plugin from offline circulation page
Owen Leonard [Thu, 21 Mar 2013 00:49:00 +0000 (20:49 -0400)]
Bug 9881 - Remove unused tablesorter plugin from offline circulation page

The offline circulation list template doesn't need to include the
tablesorter plugin, it's unused. This patch removes it.

To test, submit some circulation transactions through the Firefox
offline circulation addon. Load the offline circ page
(offline_circ/list.pl). Confirm that there are no JavaScript errors, and
that "check/uncheck all" links work correctly.

Signoff comment: Test plan works as expected. Firebug and Chrome's builtin developer tool don't raise any errors.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
One line change, followed test plan, no negative
consequences found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9863' into 3.12-master
Jared Camins-Esakov [Thu, 28 Mar 2013 02:40:32 +0000 (22:40 -0400)]
Merge branch 'bug_9863' into 3.12-master

8 years agoBug 9863: Correct casing and add arrow-heads for consistency with earlier submit...
Peter Crellan Kelly [Sun, 24 Mar 2013 09:20:14 +0000 (22:20 +1300)]
Bug 9863: Correct casing and add arrow-heads for consistency with earlier submit messages.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Small change to make interface a little bit more consistent.
Reran web installer to test correct behaviour.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoAdd two new developers to the history
Jared Camins-Esakov [Thu, 28 Mar 2013 02:14:22 +0000 (22:14 -0400)]
Add two new developers to the history

Welcome, Peter and Kristina, you are numbers 203 and 204.

8 years agoMerge branch 'bug_9595' into 3.12-master
Jared Camins-Esakov [Thu, 28 Mar 2013 02:05:14 +0000 (22:05 -0400)]
Merge branch 'bug_9595' into 3.12-master

8 years agoBug 9595: Change GPL license to 3.0
Kristina D.C. Hoeppner [Mon, 25 Mar 2013 03:48:20 +0000 (16:48 +1300)]
Bug 9595: Change GPL license to 3.0

Change the general Koha license from 2
to 3 in the About page and also link to
the new YUI BSD license page

Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All links seem to be correct now.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9918' into 3.12-master
Jared Camins-Esakov [Thu, 28 Mar 2013 02:01:56 +0000 (22:01 -0400)]
Merge branch 'bug_9918' into 3.12-master

8 years agoBug 9918 - build script updates, default to building 3.12
Robin Sheat [Mon, 25 Mar 2013 03:10:33 +0000 (16:10 +1300)]
Bug 9918 - build script updates, default to building 3.12

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9918 - Changelog updates for 3.12
Robin Sheat [Wed, 28 Nov 2012 07:02:14 +0000 (20:02 +1300)]
Bug 9918 - Changelog updates for 3.12

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9930 - can't update patron info in ccsr
Kyle M Hall [Tue, 26 Mar 2013 12:26:54 +0000 (08:26 -0400)]
Bug 9930 - can't update patron info in ccsr

Test Plan:
1) Enable ccsr theme
2) Log into update, update personal details
3) Go to mainpage.pl in intranet
4) Note there is no alert for patron modifications
5) Apply patch
6) Repeat step 2-3
6) Note there is now an alert for patron modifications

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Passes tests, tested per test plan, no side effects noted.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Requires PatronSelfRegistration and PatronSelfRegistrationDefaultCategory
to make the form show up.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9919' into 3.12-master
Jared Camins-Esakov [Mon, 25 Mar 2013 12:43:29 +0000 (08:43 -0400)]
Merge branch 'bug_9919' into 3.12-master

8 years agoBug 9919: Correct syntax error caused by missing comma.
Peter Crellan Kelly [Mon, 25 Mar 2013 03:58:28 +0000 (16:58 +1300)]
Bug 9919: Correct syntax error caused by missing comma.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simple fix for a bad problem.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9914' into 3.12-master v3.12.00-beta1
Jared Camins-Esakov [Sat, 23 Mar 2013 14:48:48 +0000 (10:48 -0400)]
Merge branch 'bug_9914' into 3.12-master

8 years agoBug 9914: dependency updates for 3.12
Jared Camins-Esakov [Sat, 23 Mar 2013 14:45:28 +0000 (10:45 -0400)]
Bug 9914: dependency updates for 3.12

Update the lists of packages required for various versions of Debian and
Ubuntu.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBump version for Koha 3.12.00-beta1 release
Jared Camins-Esakov [Sat, 23 Mar 2013 13:54:28 +0000 (09:54 -0400)]
Bump version for Koha 3.12.00-beta1 release

8 years agoCorrect 3.11 updates to use CheckVersion rather than TransformToNum
Jared Camins-Esakov [Sat, 23 Mar 2013 13:52:58 +0000 (09:52 -0400)]
Correct 3.11 updates to use CheckVersion rather than TransformToNum

8 years agoUpdate release notes for 3.12.00-beta1
Jared Camins-Esakov [Sat, 23 Mar 2013 13:35:08 +0000 (09:35 -0400)]
Update release notes for 3.12.00-beta1

8 years agoMerge branch 'bug_9912' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 13:13:32 +0000 (09:13 -0400)]
Merge branch 'bug_9912' into 3.12-master

8 years agoBug 9912: DateUtils.t must not access database
Jared Camins-Esakov [Sat, 23 Mar 2013 13:08:05 +0000 (09:08 -0400)]
Bug 9912: DateUtils.t must not access database

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoAdd Rolando Isidoro to history
Jared Camins-Esakov [Sat, 23 Mar 2013 12:29:20 +0000 (08:29 -0400)]
Add Rolando Isidoro to history

Congratulations, Rolando! You are the 202nd developer with a patch in Koha.

8 years agoMerge branch 'bug_9911' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 12:27:15 +0000 (08:27 -0400)]
Merge branch 'bug_9911' into 3.12-master

8 years agoBug 9911: update Acquisitions unit test to look for correct fields
Jared Camins-Esakov [Sat, 23 Mar 2013 12:24:13 +0000 (08:24 -0400)]
Bug 9911: update Acquisitions unit test to look for correct fields

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>