[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.01-37-g303cad8

Tue Dec 24 14:14:19 CET 2013

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.14.x has been updated
       via  303cad8f1fa1fc633be0d0ae79e4f830462d343e (commit)
       via  896a62b43b3556e49fdff2fd941f122e75e85f28 (commit)
       via  0929a7e2b6625de40c560619a68ec91c1615852a (commit)
       via  ca75ea2959988b2fbc831b77c0c9bdc7aadaea75 (commit)
       via  7870c0d8fe715fabc5dd7df87337f2300dedcc1b (commit)
       via  a2a87e04e20e98374225de87a84c5db6043f1f55 (commit)
       via  72aad868b2385d60ec59cab045aeda133a233435 (commit)
      from  ff284780e220f2885866ecc0f49bd33d8f86e67e (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 303cad8f1fa1fc633be0d0ae79e4f830462d343e
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Dec 13 23:51:18 2013 +0000

    Bug 8230: (follow-up) update POD for C4::Acquisition::GetHistory

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit bfc0a2cb812636c5eb9cc10e3cf5bfba8eee8e61)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

commit 896a62b43b3556e49fdff2fd941f122e75e85f28
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Dec 13 23:42:26 2013 +0000

    Bug 8230: (follow-up) repair regression on order search

    This patch repairs a regression introduced by the main
    patch where it became impossible to search for cancelled
    orders from the advanced order search form.

    This patch also tweaks the wording on the order status
    drop-down on the order search form to clarify that the
    default status filter is orders that have any status
    except cancelled.

    To test:

    [1] Before applying this patch, perform an advanced
        order search (acqui/histsearch.pl) for orders
        with status cancelled.  Observe that no hits are returned.
    [2] Apply the patch and run the search again.  This time,
        the cancelled orders should be returned.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 44eb83388928a020812d6fc375d565b0b2d6f9d3)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

commit 0929a7e2b6625de40c560619a68ec91c1615852a
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Dec 13 23:19:55 2013 +0000

    Bug 8230: (follow-up) fix detection of cancelled orders

    This patch fixes a problem where the quantity / items column
    in the acquisitions detail table would display ilnks to
    items for cancelled orders.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit da3e33bff37a92caeb00f69db7e83b17e60eada6)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

commit ca75ea2959988b2fbc831b77c0c9bdc7aadaea75
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Dec 13 23:04:59 2013 +0000

    Bug 8230: (follow-up) don't link to basket unless user has appropriate permissions

    With this patch, the basket number on the bib details page is linked
    to the basket management page only if the staff user has the appropriate
    permissions.

    To test:

    [1] Log in as a user with the acquisition/order_manage permission.
        Bring up a bib record that is attached to an order and verify
        that the basket number is an active link.
    [2] Log in as a user that doesn't have the acquisition/order_manage
        permission.  Verify that the basket number displayed on the bib
        details page is not a hyperlink.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit a050ca83b717c0212e4ae7d102ea1d1f13208edb)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

commit 7870c0d8fe715fabc5dd7df87337f2300dedcc1b
Author: Fridolin SOMERS <fridolin.somers at biblibre.com>
Date:   Tue Dec 24 14:27:12 2013 +0100

    Bug 8230: DBrev 3.14.01.002

    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

commit a2a87e04e20e98374225de87a84c5db6043f1f55
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Oct 18 15:05:11 2013 +0200

    Bug 8230: (follow-up) reflect the fact that order statuses are now alphabetic codes

    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Passes koha-qa.pl, works as advertised. No regressions found.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit ba3bb0a4f80bf565d784cb151a5623725ae4e3cf)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

commit 72aad868b2385d60ec59cab045aeda133a233435
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Sep 18 14:30:05 2013 +0200

    Bug 8230: Display acquisition details on the catalogue detail page

    This patch adds a new tab "Acquitition details" on the catalogue detail
    page. It provides a list of order made for this biblio.

    New system preference:

    AcquisitionDetails: Hide/Show the new tab.  The default for
    new and upgraded installations is to display the new tab.

    Test plan:
    1/ Apply the patch.
    2/ Select the "placing an order" value for the AcqCreateItem pref.
    3/ Create a new order with X items.
    4/ Go on the catalogue detail page for the selected biblio.
    5/ Click on the "Acquisition details" tab and check that your order is
    displayed. Itemnumbers are present in the last column. Check that links
    are not broken.
    6/ Close your basket.
    7/ Status become "Ordered"
    8/ Receive X-1 items.
    9/ Come back on the catalogue detail page. There are 2 orders: 1
    complete and 1 partial. The complete one has a receive date.
    10/ Receive the last item.
    11/ Now you have 2 orders with a complete status.
    12/ Cancel the last receipt.
    13/ You have 1 ordered and 1 complete (2 items).
    14/ Cancel the first receipt.
    15/ You have 1 ordered (3 items).
    16/ Delete your order
    17/ You have 1 deleted order.
    18/ Switch the AcqCreateItem pref to "receiving an order"
    19/ Do again steps 3 to 17.

    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 7180eb1153cbb2849b0171014cf84eda0993b465)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

    Conflicts:
    	installer/data/mysql/updatedatabase.pl

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

Summary of changes:
 C4/Acquisition.pm                                  |   20 +++++-
 catalogue/detail.pl                                |   16 ++++-
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |    7 ++
 .../prog/en/modules/acqui/histsearch.tt            |    2 +-
 .../en/modules/admin/preferences/cataloguing.pref  |    6 ++
 .../prog/en/modules/catalogue/detail.tt            |   69 ++++++++++++++++++++
 kohaversion.pl                                     |    2 +-
 8 files changed, 118 insertions(+), 5 deletions(-)

hooks/post-receive
-- 
main Koha release repository