[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.12-77-gea7de7c

Git repo owner gitmaster at git.koha-community.org
Fri Jun 13 14:55:46 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.12.x has been updated
       via  ea7de7c04e8002cbcf599094a97534f51ca125ed (commit)
       via  290d6af68b3919f9a5d872cf4136424f4b5d9b5d (commit)
       via  82ab1ca3a8b2775cc019ad5fa2bc8d003450bd2a (commit)
       via  67e56a3604df625a998be1c5eb2221f0d1cbdfab (commit)
       via  78c5f7635e926a6b39a86749d50ab7c7e671028f (commit)
       via  2552db23c48fcfdacd8b551c8779ee6aa144ecc6 (commit)
       via  98c6cea19781adae177b0281fb8e1c67e0d74540 (commit)
       via  af294e6749392676a0e15b2433c95dbed4a1b484 (commit)
       via  ca6b9bb2ee03ab1b7e8238d1237924e3ae88079d (commit)
       via  c3f8c82df88d4aea3dff66f3aae9c4481c5d4998 (commit)
       via  74235862487dccad35ee02ea3377308807a8925a (commit)
       via  dcf7b425abd18b57d58212e77b80db8cfa484fe7 (commit)
       via  f9635730a318a80ea7690d7541f05be7796f8017 (commit)
       via  a04f1d67679fde36c12265a35ec76b1a42977209 (commit)
       via  d99d7df596168be1fa2f554768192f2d7947f4aa (commit)
       via  6e53a64d9dcde43b3238708a7b7b6b4cde1317df (commit)
       via  af05c00501d2cc245a3f3af929fe30c7dca4019a (commit)
       via  f003b66827f5155049474c89a9665ccec8001402 (commit)
       via  a72008c3c73ed44fa48886454828f500a9450683 (commit)
      from  747fcb30e52a2020e2bc6b5008d8f65cc52497a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ea7de7c04e8002cbcf599094a97534f51ca125ed
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Feb 28 14:48:36 2014 -0500

    Bug 11877 - Eliminate use of deprecated jQuery .live() method
    
    As of jQuery 1.9 the .live() method has been removed. A few templates
    contain JavaScript which uses it. It can be easily replaced with .on().
    This patch makes the correction.
    
    To test, apply the patch and test the following pages:
    
    - In the staff client, Administration -> OAI sets configuration:
      Define mappings for an existing set. You should be able to add rows by
      clicking the "OR" button. You should be able to delete or clear any
      line by clicking the "Delete" link.
    
    - In the staff client, view the details for any patron and click the
      "Change password" button: In the change password form click the link
      to fill the password fields with a random password. This link should
      work correctly.
    
    - If necessary enable OpacRenewalAllowed in system preferences. Log in
      to the OPAC as a patron who has checkouts. On the patron summary page
      (opac-user.pl) look for the "renew selected" and "renew all" links at
      the top of the table of checkouts. Both these links should work
      correctly. Test in prog and bootstrap themes.
    
    Followed test plan. Same behaviour as without patch, i.e. patch OK
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script, works as described.
    No Javasript errors found.
    
    Note: The buttons on the form show up, even if no item shows the
    checkbox. In my case the problem was that I had 0 renewals allowed
    in the circulation rules. Maybe we could hide them, if no item
    can be renewed.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 330e903e798c22d041a0378ce4a806c3cdebd2bd)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 46c3fad78521af0cc1ceebf399fafbd3b65a27cf)

commit 290d6af68b3919f9a5d872cf4136424f4b5d9b5d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Mar 17 17:21:09 2014 +0100

    Bug 11939: set active currency for non-English sample data
    
    Revised Test Plan
    -----------------
    The following SQL commands were used to test this.
    
    installer/data/mysql/en/optional/parameters.sql is part of the
    first patch and didn't really need testing again.
    
    installer/data/mysql/de-DE/optional/parameters.sql is not part
    of the patch, but since I was playing with the script, which
    is also attached here, it was included for good measure.
    
    use kohadata;
    SET FOREIGN_KEY_CHECKS=0;
    TRUNCATE currency;
    source /home/mtompset/kohaclone/installer/data/mysql/pl-PL/optional/parameters.sql
    SET FOREIGN_KEY_CHECKS=0;
    TRUNCATE currency;
    source /home/mtompset/kohaclone/installer/data/mysql/es-ES/optional/parameters.sql
    SET FOREIGN_KEY_CHECKS=0;
    TRUNCATE currency;
    source /home/mtompset/kohaclone/installer/data/mysql/ru-RU/optional/sample_currency.sql
    SET FOREIGN_KEY_CHECKS=0;
    TRUNCATE currency;
    source /home/mtompset/kohaclone/installer/data/mysql/uk-UA/optional/sample_currency.sql
    SET FOREIGN_KEY_CHECKS=0;
    TRUNCATE currency;
    source /home/mtompset/kohaclone/installer/data/mysql/it-IT/necessari/parameters.sql
    SET FOREIGN_KEY_CHECKS=0;
    TRUNCATE currency;
    source /home/mtompset/kohaclone/installer/data/mysql/de-DE/optional/parameters.sql
    SET FOREIGN_KEY_CHECKS=0;
    TRUNCATE currency;
    source /home/mtompset/kohaclone/installer/data/mysql/nb-NO/2-Valgfritt/parameters.sql
    SET FOREIGN_KEY_CHECKS=0;
    TRUNCATE currency;
    source /home/mtompset/kohaclone/installer/data/mysql/en/optional/parameters.sql
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit ed10e5226cc8e9852dfee3f5520976695cb99412)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 0e6a85ad7c09eccc99fbce9af47d4ae9ddae4350)

commit 82ab1ca3a8b2775cc019ad5fa2bc8d003450bd2a
Author: Zeno Tajoli <z.tajoli at cineca.it>
Date:   Fri Mar 14 11:38:07 2014 +0100

    Bug 11939: set active currency when using English sample data
    
    This patch offers a better default for currencies,
    with USA dollar as default active currency.
    
    To test the patch:
    1)Install master without the patch, during web installation
    select 'parameters.sql' file
    2)Finish install and go to Administration -Currencies & Exchange rates
    3)No active currency
    
    4)Install master with this patch, during web installation
     select 'parameters.sql' file
    5)Finish install and go to Administration -Currencies & Exchange rates
    6)Now USA dollar is the active currency
    
    NOTE: This does solve the problem of everything being NULL for active,
          and lacking an active value. It also corrects the description
          of the optional item to check related to currencies.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as described, passes all tests and QA script.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 6a5c2d51819c193580a2bc42856215a9b7d3b9f8)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 9eb55874ca87794b1a254bd2a194d3f1453e14b8)

commit 67e56a3604df625a998be1c5eb2221f0d1cbdfab
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Jun 13 09:11:10 2014 -0400

    Bug 11973 - DBRev 3.12.12.001
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 78c5f7635e926a6b39a86749d50ab7c7e671028f
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Thu Mar 20 08:45:14 2014 -0300

    Bug 11973 - Fix Armenian language description
    
    This patch fix Armenian language description
    
    To test:
    1) Do a fake translation to Armenian,
       mkdir koha-tmpl/intranet-tmpl/prog/hy-Armn
    2) Go to Administration > System preferences > I18N/L10N
    3) Armenian description looks like the second string in Bug description
    4) Apply the patch
    5) Run updatedatabase.pl
    6) Reload page, now description look as first string in
    Bug description (it's the sixth letter, similar to 't')
    
    Ammended patch, wrong column.
    
    Signed-off-by: Holger Meißner <h.meissner.82 at web.de>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Patch fixes the English sample file for translations and includes
    a database update to correct the string in existing installations.
    Passes all tests and QA script.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 8f8ce37e88e87b3286275f07f54832f82b9fce9e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit b41e6ca1b697f1dc85a64c9043c9257dbe22dc47)

commit 2552db23c48fcfdacd8b551c8779ee6aa144ecc6
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Mar 19 13:11:52 2014 +0100

    Bug 11957: reomve disused sample_only_param_tables.sql
    
    This sql file tries to insert data into nonexistent tables.
    It is useless and can be removed.
    
    Test plan:
      git grep sample_only_param_tables
    should not return any result.
    
    NOTE: This is basically a git rm. Simple patch.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    File is not used by the installers and it wouldn't work
    with today's Koha for trying to insert data into non-existant
    tables and tables with different structure.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 9c7f137f5e518187f0b3a0fd3b3e55b75d07e362)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit a9a15f38f5b3caedea1f1034be00c5ba05768b43)

commit 98c6cea19781adae177b0281fb8e1c67e0d74540
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Jan 24 12:49:39 2014 +0100

    Bug 8168: (follow-up) Use semicolon as default CSV delimiter
    
    installer/data/mysql/sysprefs.sql has semicolon as default.
    This fixes both instances to use the same fallback value.
    
    It also prevents CSV header info from being included in non-CSV messages.
    
    Signed-off-by: wajasu <matted-34813 at mypacks.net>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 7408fa5d7087fad5c8f15b742b9624cbfe652a61)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 33e32758999c47549fba392f8c67fc0ca2917b3f)

commit af294e6749392676a0e15b2433c95dbed4a1b484
Author: Daniel Barker <daniel.barker.nz at gmail.com>
Date:   Wed Jan 15 09:57:19 2014 +1300

    Bug 8168: Fixing header of non CSV files for overdue notices
    
    This determines if the CSV header should be included or not and
    then generates it as needed using the delimiter specified in the
    delimiter system preference.
    
    TEST PLAN
    ---------
    1. make some overdues books
    2. run the overdue notices script without the -csv
    3. check emails notice csv header is in the email
    4. apply the patch
    5. run the overdue notice again
    6. check email notice CSV header is absent
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: wajasu <matted-34813 at mypacks.net>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit a31210efd34dc7e3c65f8491c26c2d8f8fc36dfb)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 48ee914631cb1ec889db8a15085f3519c20b2b7e)

commit ca6b9bb2ee03ab1b7e8238d1237924e3ae88079d
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Mar 14 11:10:19 2014 -0400

    Bug 11935: fix capitalization: OPAC prog theme, checkouts tab
    
    opac-user.tt in the prog theme contains 'Renew Selected' and 'Renew
    All'. These are incorrectly capitalized. This patch corrects.
    
    To test you must have OpacRenewalAllowed enabled. Apply the patch,
    switch to the prog theme, and log in to the OPAC as a patron who has
    checkouts.
    
    At the bottom of the table of checkouts you should see the renew buttons
    with correct capitalization.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    String change, all good.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 657cd3c4c0a784e2d8e202b94d538c9229fb463a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 8dc1661d598aee9681f29794bf60dd2e4205d22d)

commit c3f8c82df88d4aea3dff66f3aae9c4481c5d4998
Author: A. Sassmannshausen <alex.sassmannshausen at ptfs-europe.com>
Date:   Thu Mar 13 16:06:29 2014 +0000

    Bug 11762 - intranet & prog: Re-order 245 $a $b $h in results.
    
    In the results view for OPAC and Intranet search results, titles are
    currently displayed in 245 $a $b $h order. In detailed view the titles
    are displayed in the better 245 $a $h $b order.
    
    This patch corrects the behaviour for NORMARC and MARC21: all now
    display 245 $a $h $b.
    
    To test:
    - Find records containing 245 $a $b and $h fields.
    - Compare the way they look in detail and results view in OPAC
      (non-bootstrap) and intranet (you should see a discrepancies).
    - Apply the patch.
    - Re-check detail and results view: all should now look the same in
      both OPAC (non-bootstrap) and intranet.
    
    Signed-off-by: Jesse Weaver <pianohacker at gmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script, works as described.
    Checked with Magnus Enger about the changes for the NORMARC
    stylesheets and the changes are ok.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 266f6a095c15af1e56238e43c05bdbfc406afad4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 9281c44a162f8b1da05086759056a4fabc68f140)

commit 74235862487dccad35ee02ea3377308807a8925a
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Wed Jan 22 15:38:41 2014 -0300

    Bug 9114: Make frameworks import/export routines correctly use UTF-8
    
    Currently both the import_export_framework.pl script outputs data with
    Perl's default encoding, ISO-8859. This patch properly sets
    the binmode to UTF-8 when exporting SQL and CSV files using the PerlIO
    layer (":encoding(UTF-8)") for STDOUT.
    
    To test:
    
    Export step test
    - Use some ASCII character(s) with DIACRITICS in some field description
      in a chosen framework.
    - Export the framework at Administration > MARC frameworks
    - Run this to check the file is ISO-8859 encoded:
     $ file export_XXX.csv
     export_XXX.csv: ISO-8859 text, with very long lines
     (Note: try SQL and other output formats too. But not ODS)
    - Apply the patch
    - Export the framework again (change the name), and test encoding:
     $ file export_XXX_2.csv
     export_XXX_2.csv: UTF-8 Unicode text
    
    Import step test
    I assume you have two files, export_XXX.csv (ISO-8859 encoded) and
    export_XXX_2.csv (XXX will depend on your framework's code)
    - Reset your testing branch to master
    - Import export_XXX.csv
    - The string with non-ASCII chars is truncated at the first non-ASCII
      char's position (Note: this is the current behaviour).
    - Import export_XXX_2.csv
    - The non-ASCII chars are broken, the logs show errors on non-UNICODE
      chars.  (Note: even thou UTF-8 is the expected encoding it is
      treated as ISO-8859).
    - Apply the patch
    - Import the good (UTF-8 as expected) file and check everything worked
      as expected.
    
    No double encoding should occur with either combination of formats.
    
    Sponsored-by: Universidad Nacional de Cordoba
    Signed-off-by: Magnus Enger <digitalutvikling at gmail.com>
    I put some Norwegian and accented letters in a fremawork to test.
    Before the patch, the exported CSV came out as ISO-8859, after the
    patch it came out as UTF-8. ODS and XML (viewed in LibreOffice)
    both looked good, before and after the patch.
    
    Importing the ISO-8859 CSV cut off the strings at the first non-ASCII
    char. Importing the UTF-8 CSV worked as epected.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as expected, passes tests and QA script.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 40d3800cc4d73be3f40fb3b895de3e7fe29e4999)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 59036877f2cd8f817fd3689c8feeb91891428185)

commit dcf7b425abd18b57d58212e77b80db8cfa484fe7
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Thu Mar 13 15:17:37 2014 +0000

    Bug 11934: (follow-up) tidy up whitespace
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 3a99c0441a7400ddc2437300b94a98e645c89881)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit f4a717106d8db4bbad991752109ac50fe52545d9)

commit f9635730a318a80ea7690d7541f05be7796f8017
Author: Nicolas Legrand <nicolas.legrand at bulac.fr>
Date:   Thu Mar 13 10:40:27 2014 +0100

    Bug 11934 - Replace given by if-else statements
    
    To test:
    
    [1] Verify that prove -v t/db_dependent/Circulation_issuingrules.t
        passes.
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    replaces given-when with if-elsif-else constructs.
    Tests still pass and code looks good.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 12df62ca33047df0c5cd372bf5574cf131f773e0)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit e4c1de744b6fa0765aa3f308dba7234f71da71e9)

commit a04f1d67679fde36c12265a35ec76b1a42977209
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Thu Mar 13 14:57:04 2014 +0000

    Bug 11647: (follow-up) add comment expressing that user must be logged in
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit e34508744d3e76827e911531a56f84731a669784)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 21b766adc9e00ac98951c503b454f917d1a8cbd4)

commit d99d7df596168be1fa2f554768192f2d7947f4aa
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date:   Mon Mar 10 17:07:07 2014 +0100

    Bug 11647: (follow-up) test if user is logged in before proposing to subscribe or unsubcribe from serial routing list
    
    To test :
    1) Search for a subscription with patron notification active
    2) If you're not logged in, a message warns you that you must log
       in to subscribe to notification on new issues
    3) If you log in, and have not yet subscribed to this routing list,
       you've got a link to subscribe
    4) Once you have subscribed, you've got a link to unsubscribe
    5) If you log out, you've got a message saying you must log in to
       subscribe
    6) If you log in with another user, you've got the link to subscribe
       or unsubscribe depending on if he has already subscribed.
    
    Signed-off-by: remy juliette <remy.gonzalves at iepg.fr>
    
    Signed-off-by: Aurelie Fichot <aurelie.fichot at iepg.fr>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit b056f93c4d33a9a56d56bbb081924f7c4c974a79)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit a5588825138f2156682342eb012e3f08d65441d2)

commit 6e53a64d9dcde43b3238708a7b7b6b4cde1317df
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date:   Fri Jan 31 12:22:05 2014 +0100

    Bug 11647: require that user log into OPAC to request email subscription notifications
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: remy juliette <remy.gonzalves at iepg.fr>
    Signed-off-by: Aurelie Fichot <aurelie.fichot at iepg.fr>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes QA script and tests.
    Instead of hiding the feature completely, now a message
    tells the user to login to subscribe to the email
    notifications.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 6310c992bf23d164f013ead7c0b2182226279454)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit fc7e66d984a7d113c940121a990606361d263332)

commit af05c00501d2cc245a3f3af929fe30c7dca4019a
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed Mar 5 14:26:14 2014 +0100

    Bug 11366: make "no group" option in acq basket group drop-down translatable
    
    in Acq baskets, there's a pull-down for basket groups. One of the
    entries in that pull-down is "No group", which is untranslatable.
    This string is hard-coded in Perl.
    
    This patch removes the string from Perl to set it has first option
    in select. To allow it to be default value, the option "Add new group"
    is moved to last position.
    
    Test plan :
    - Go to a closed aquisition basket in no basket group :
      cgi-bin/koha/acqui/basket.pl?basketno=x
    => You see "No group" selected in combobox "Basket group"
    - Cick on this combobox
    => You see "No group", then existing basket groups and then "Add new
       group"
    - Select a basket group and click on "change basket group"
    => You see the basket group name in combobox
    Use translation, for example fr-FR
    - go to src/misc/translator
    - run : perl translate update fr-FR
    => You find in PO file :
      #: intranet-tmpl/prog/en/modules/acqui/basket.tt:365
      #, fuzzy, c-format
      msgid "No group"
      msgstr "Nom de groupe"
    - remove ", fuzzy" and correct translation : "Pas de groupe"
    - run : perl translate install fr-FR
    - Go to translated aquisition basket page
    => You see translated option in combobox
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 21e6518d32477fa1fe59da64d735f3f07ae49bcd)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 1b760f8e4df32f73861b96ffc5ea4e2d0bd196a5)

commit f003b66827f5155049474c89a9665ccec8001402
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed Feb 26 11:03:18 2014 +0100

    Bug 11845 - set overlay and import status translatable in addorderiso2709.tt
    
    In addorderiso2709.tt, the text for overlay and import status come from
    database and was not translatable.  Ths patch fixes that.
    
    Same as Bug 10170.
    
    Test plan :
    - Go to acquisition module
    - Display an open basket
    - Click on "From a staged file"
    - Look at table
    => Without patch, you see codes in "Status" column : staged, imported, ...
    => With patch, you see descriptions in "Status" column : Staged, Imported, ...
    - Click on a "Add orders"
    - Look at table
    => Without patch, you see codes in "Match?" column : no_match, auto_match, ...
    => With patch, you see descriptions in "Match?" column : No match, Match found, ...
    
    Signed-off-by: Nathalie CHATILLON <nathalie.chatillon at uhb.fr>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    This is an improvement. Only the translation of auto_match as Match found
    could perhaps be further improved.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 20d0aff0e88544cdddfb4a6b90fc73ed652c84bd)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit b505b7996c80d3740e7c0b12a650964018e92d5c)

commit a72008c3c73ed44fa48886454828f500a9450683
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Mon Jan 13 12:39:51 2014 -0500

    Bug 11531: make it possible to edit transport cost for a new libraries
    
    If you are using the transport cost matrix, and you create a new
    library, you cannot edit the fields for this library!
    
    Test Plan:
    1) Enable the transport cost matrix
    2) Set some transport cost values in the matrix
    3) Save the matrix
    4) Create a new library
    5) View the transport cost matrix again
    6) Note the uneditable fields for the new branch
    7) Apply this patch
    8) View the transport cost matrix again
    9) Note you can now edit the fields for the new branch
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as described, passes all tests and QA script.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 4edcec3d5812b159b7012c43a04577bfd7e462bc)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit a143dec8a0b8490ff5ebae3e72599a2e94a0a8f7)

-----------------------------------------------------------------------

Summary of changes:
 acqui/basket.pl                                    |    7 -
 admin/import_export_framework.pl                   |    4 +
 admin/transport-cost-matrix.pl                     |    4 +
 .../data/mysql/en/mandatory/subtag_registry.sql    |    2 +-
 installer/data/mysql/en/optional/parameters.sql    |   11 +-
 installer/data/mysql/en/optional/parameters.txt    |    2 +-
 installer/data/mysql/es-ES/optional/parameters.sql |   10 +-
 .../data/mysql/it-IT/necessari/parameters.sql      |    8 +-
 .../data/mysql/nb-NO/2-Valgfritt/parameters.sql    |   10 +-
 installer/data/mysql/pl-PL/optional/parameters.sql |   10 +-
 .../data/mysql/ru-RU/optional/sample_currency.sql  |   12 +-
 installer/data/mysql/sample_only_param_tables.sql  |  152 --------------------
 .../data/mysql/uk-UA/optional/sample_currency.sql  |   12 +-
 installer/data/mysql/updatedatabase.pl             |    9 ++
 .../prog/en/modules/acqui/addorderiso2709.tt       |   30 +++-
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |    3 +-
 .../prog/en/modules/admin/oai_set_mappings.tt      |    9 +-
 .../prog/en/modules/members/member-password.tt     |    7 +-
 .../prog/en/xslt/MARC21slim2intranetResults.xsl    |    8 +-
 .../prog/en/xslt/NORMARCslim2intranetDetail.xsl    |   12 +-
 .../prog/en/xslt/NORMARCslim2intranetResults.xsl   |    8 +-
 .../prog/en/modules/opac-serial-issues.tt          |   18 ++-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |    8 +-
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        |    8 +-
 .../prog/en/xslt/NORMARCslim2OPACDetail.xsl        |   12 +-
 .../prog/en/xslt/NORMARCslim2OPACResults.xsl       |   12 +-
 kohaversion.pl                                     |    2 +-
 misc/cronjobs/overdue_notices.pl                   |   13 +-
 opac/opac-alert-subscribe.pl                       |    3 +-
 opac/opac-serial-issues.pl                         |   18 ++-
 t/db_dependent/Circulation_issuingrules.t          |   31 ++--
 31 files changed, 181 insertions(+), 274 deletions(-)
 delete mode 100644 installer/data/mysql/sample_only_param_tables.sql


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list