[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.01-69-g177ff20

Tue Jul 14 22:38:08 CEST 2015

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.20.x has been updated
       via  177ff20ec2f249ebacee5f793fa0926ded6d1184 (commit)
       via  df0d0c96957ee737f59d1ef02bd48ebeb20b3823 (commit)
       via  9c2c171f980d6e6a74ea1122ded2627b42e29d0e (commit)
       via  e67d0dd60285542160a65ccb28e12962948cc438 (commit)
       via  5bc2f3402d23764f2f2142cfa22e17cf01d6e5aa (commit)
      from  606b39b789d89ce90ffe0136b355e695d98383ee (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 177ff20ec2f249ebacee5f793fa0926ded6d1184
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Jul 2 10:37:22 2015 +0200

    Bug 14485: HTML comment disables translation in cataloguing/addbooks.tt

    In cataloguing/addbooks.tt, the line :
      [% total %] result(s) found in catalog,
    is not present in PO files even after an update.
    I've found that the cause is the previous HTML comment line.

    This patch converts HTML comment into TT comment and adds a div to have a more comprehensive string to translate.

    Test plan :
    - without patch
    - go into <sources>/misc/translator
    - run PO update for example in french : translate update fr-FR
    => the text "result(s) found in catalog" is missing from PO file : fr-FR-staff-prog.po
    - restore default PO files
    - apply patch
    - go into <sources>/misc/translator
    - run PO update for example in french : translate update fr-FR
    => You find text "result(s) found in catalog" in PO file : fr-FR-staff-prog.po

    Sponsored-by: Universidad de El Salvador

    Signed-off-by: Hector Eduardo Castro Avalos <hector.hecaxmmx at gmail.com>
    Works as advertised. Just one msgid appear with msgid "%s result(s) found in catalog,"

    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit e2ab42716825c5dedbb0036ae56a28e6119083f5)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit df0d0c96957ee737f59d1ef02bd48ebeb20b3823
Author: David Cook <dcook at prosentient.com.au>
Date:   Tue Jun 9 14:25:23 2015 +1000

    Bug 14366: Units doesn't get saved usefully for patroncards

    This patch causes the "Units" to be saved and displayed correctly
    for the "Edit layout" screen in Patroncards.

    _TEST PLAN_

    Before applying:
    0) Create a new layout
    1) Edit the layout, change the units, and click Save
    2) Edit the layout again, and notice the units are still "PostScript Points"

    Apply the patch:
    3) Edit the layout again, change the units, and click Save
    4) Edit the layout again, note that the units have changed to your
    selection

    5) Rejoice

    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>

    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit f573a155974c84a6fb433bff86a220d4644ad27e)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 9c2c171f980d6e6a74ea1122ded2627b42e29d0e
Author: Nick Clemens <nick at quecheelibrary.org>
Date:   Tue Jun 16 21:48:18 2015 -0400

    Bug 13950: Sort Item search home library list by branch name

    On the item search form the list of home libraries isn't sorted
    alphabetically by their descrption.

    To test:
    - Ensure that you have libraries whose code/name are sorted in a different alphabetical order (e.g. Aardvark/ZZZ & Zebra/AAA)
    - Staff: Advanced search - item search
    - See that libraries are sorted in code order
    - Apply patch
    - Verify selection block for home library is correctly sorted after
      applying the patch.

    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 958be9804a50c3e13f74c4d5f81348e2256a8042)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit e67d0dd60285542160a65ccb28e12962948cc438
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun May 31 15:52:26 2015 +0200

    Bug 14163: Acq - receive shipment and order from staged: rename 'Show all' to 'Show inactive'

    'Show all' in acquisition makes the inactive funds in the fund list
    box visible. This patch changes the text to 'Show inactive' to be more
    clear about the functionality.

    Patch changes 2 pages. To test:

    1) Order from staged file
    - make sure you have uploaded a few records via the tools
    - create a new order using the 'From a staged file' option
    - select a file to order from - 'Add orders'
    - Verify the 'Select to import' tab now displayed the text
      'Show inactive funds' and that it works as expected
    - Switch to the 'Default accounting details' tab
    - Verify the text there is also changed to 'Show inactive' and
      works like expected.

    2) Receive shipment
    - receive a new shipment for a vendor with unreceived orders
    - Verify the label next to the fund list has changed to
      'Show inactive' and works as expected.

    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Simple string change, no errors.

    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 83387bf3b1d9eb8710e184269338361ac1477d1c)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 5bc2f3402d23764f2f2142cfa22e17cf01d6e5aa
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon May 25 10:45:54 2015 +0200

    Bug 14163: Acq order form: rename 'Show all' to 'Show inactive'

    On the order form there is a checkbox next to the fund list labelled
    'show all'. Checking the checkbox will result in the inactive funds
    showing in the pull down list as well.

    The patch renames the label to 'Show inactive' to make the purpose
    more clear.

    To test:
    - Create a new order
    - Verify the label has changed as described above
    - Decide if the change makes sense

    Signed-off-by: tadeasm <tadeas.moravec at gmail.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 8eb049a6a1697f8b2cd23cd660d508ad1ef629e7)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 catalogue/itemsearch.pl                                        |    2 +-
 .../intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt     |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt       |    2 +-
 .../intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt      |    8 +++++---
 patroncards/edit-layout.pl                                     |    7 +++++++
 6 files changed, 17 insertions(+), 8 deletions(-)

hooks/post-receive
-- 
main Koha release repository