[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.05-18-gf13d33b

[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  f13d33b26de2654524ef1ac2005b138a645a6886 (commit)
       via  2d697ec0ca32d9076cafe9a119c1e84809c84243 (commit)
       via  facb734e4a257bb96251f592c16cd4ac71c2dd39 (commit)
       via  aaf04836501a7be551b7edaf35acfea4b6a5ab5d (commit)
      from  ac3028d850d633bc9abed5fa1731f11f21b5dab2 (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 f13d33b26de2654524ef1ac2005b138a645a6886
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Jan 17 11:21:05 2014 +0100

    Bug 11549: [follow-up] Make NewOrder calculate new parent_ordernumber
    
    If parent_ordernumber is not set in NewOrder parameter, it is
    automatically set to ordernumber.
    
    This patch only avoid code duplication.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    This solution is better!
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script. Also all tests in
    t/db_dependent/Acquisitions/.
    
    Confirmed bug and that the patch fixes it.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 9cb6174653185e8ea37871245c8d25092d8e4a81)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 2d697ec0ca32d9076cafe9a119c1e84809c84243
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Jan 14 12:13:31 2014 +0100

    Bug 11549: (follow-up) interpolated variables into SQL statements should not be allowed
    
    Signed-off-by: Sonia BOUIS <sonia.bouis at univ-lyon3.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 6e861c5563ddd807088e31a11776fb49014de27e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit facb734e4a257bb96251f592c16cd4ac71c2dd39
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Jan 14 12:06:34 2014 +0100

    Bug 11549: make it possible to receive and cancel the receipt of a transferred order
    
    To reproduce the issue:
    - transfer an order from a basket to another. Note the previous
    ordernumber (X) and the new one (Y).
    - receive the order
    - cancel the receipt
    - verify the order has been deleted:
    select count(*) from aqorders where ordernumber=Y;
    select * from aqorders_transfers where ordernumber_from = X;
    The value for ordernumber_to is null.
    
    To test this patch:
    - apply this patch
    - transfer an order from a basket to another
    - receive the order
    - cancel the receipt
    - verify the order still exist in the basket where the transfer has been
      done.
    
    Signed-off-by: Sonia BOUIS <sonia.bouis at univ-lyon3.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 6d63881e0447bae83d21b6f082ee1549277c6071)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit aaf04836501a7be551b7edaf35acfea4b6a5ab5d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Jan 14 12:04:24 2014 +0100

    Bug 11549: Add regression test
    
    test plan:
    prove t/db_dependent/Acquisition/TransferOrder.t should fail before the
    patch and success after applying it.
    
    Signed-off-by: Sonia BOUIS <sonia.bouis at univ-lyon3.fr>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Testing notes on last patch.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit e974b554a5cc08413e66c43072e857f3d2b5458e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/Acquisition.pm                          |    5 +++--
 t/db_dependent/Acquisition/TransferOrder.t |   11 +++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository