[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.00-54-gd7a48fd

[Git repo owner]

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  d7a48fd19e9ce852a658e2ad824227a9eb87e7e8 (commit)
       via  102bbe53697763ebca2b1b76025e48dc963032b0 (commit)
       via  fef1d9fcbfd0f8cb624f3647e3e38acbb52dae17 (commit)
      from  cd394cda1efd7b34dc86d1da42193e4b609aeea4 (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 d7a48fd19e9ce852a658e2ad824227a9eb87e7e8
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Thu Dec 5 15:53:23 2013 +0000

    Bug 11111: (follow-up) fix column sorting on parcels page
    
    This patch fixes issues with the column sorting on the
    pending orders and already received tables introduced by
    the main patch.
    
    To test:
    [1] Verify that the sort widgets on the appropriate columns
        of each table work correctly.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit d3ac02b7bd29d180979a8174e60e91506cc0b231)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

commit 102bbe53697763ebca2b1b76025e48dc963032b0
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Nov 4 09:30:38 2013 +0100

    Bug 11111: UT: SearchOrders returns keys basketgroupid and basketgroupname
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 7d2f975f3bc52f068ecee00ca427e03b8ad5b971)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

commit fef1d9fcbfd0f8cb624f3647e3e38acbb52dae17
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Oct 22 14:05:48 2013 +0200

    Bug 11111: display the basket group name on the parcel page
    
    Test plan:
    Go on acqui/parcel.pl?invoiceid=XX page and verify the basket group name
    is displayed into the 2nd column of the pending orders and already
    received tables.
    
    Signed-off-by: Ed Veal <ed.veal at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Changed basketgroup to basket group to match spelling on other
    pages.
    Works as described, passes tests and QA script.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 796281914491b5b77dcee405877ddfaa894d2c60)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/Acquisition.pm                                  |    2 ++
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |   36 +++++++++++++++-----
 t/db_dependent/Acquisition.t                       |    5 ++-
 3 files changed, 34 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
main Koha release repository