[koha-commits] main Koha release repository branch master updated. v3.14.00-568-g87330b9

[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, master has been updated
       via  87330b90f493d6c90168276fc749334f32beee96 (commit)
       via  c44853ce3138e413612c5a95a4966734848163d9 (commit)
       via  fe520d5b143611aee154e71ebcd1d460b62c60a6 (commit)
      from  6e1004544cce61822d03062645fb5460cb606a7c (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 87330b90f493d6c90168276fc749334f32beee96
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Mar 11 09:54:55 2014 +0100

    Bug 11170: (follow-up) improve a bit of unnecessarily convoluted logic
    
    This patch also adds POD and UT for the change in SearchOrders()
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit c44853ce3138e413612c5a95a4966734848163d9
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Dec 16 11:58:32 2013 +0100

    Bug 11170: (follow-up) fix typo 'occured' in parcels.tt
    
    Found this typo while testing bug 11170.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit fe520d5b143611aee154e71ebcd1d460b62c60a6
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Oct 30 15:34:15 2013 +0100

    Bug 11170: make the pending order list only display orders to receive
    
    The order status ordered is set when the basket is closed.
    The parcel page should only display status "ordered" and "partial".
    
    Test plan:
    - create a basket.
    - create an order.
    - verify the order is not listed on the parcel page (i.e. you cannot
      receive it).
    - close the basket.
    - verify the order is listed on the parcel page.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 C4/Acquisition.pm                                  |   12 +++++++++---
 acqui/parcel.pl                                    |    3 ++-
 .../intranet-tmpl/prog/en/modules/acqui/parcels.tt |    2 +-
 t/db_dependent/Acquisition.t                       |   20 +++++++++++++++++++-
 4 files changed, 31 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository