[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.09-78-g3e738bc

[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  3e738bc4818141a6f815b81b8f73c0394522f0aa (commit)
       via  adf95aac2f5f5ee755ebcab40507e2fc8fd8ceb9 (commit)
       via  d98e5a09fc90d66ed8ba28b6ccd6eef0baea73fa (commit)
       via  1904e0c129bed1f8659e53a2fcfffcd1581f4502 (commit)
      from  37f8245894ed7858da7aeb580b866fb624536f50 (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 3e738bc4818141a6f815b81b8f73c0394522f0aa
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Sat Apr 19 15:39:52 2014 +0000

    Bug 11699: (follow-up) update one more test that uses ModReceiveOrder
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit e7433b970ce9187b8b073b9b2581950308dce22a)

commit adf95aac2f5f5ee755ebcab40507e2fc8fd8ceb9
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Sat Apr 19 15:12:08 2014 +0000

    Bug 11699: (follow-up) fix errors in the POD for ModReceiveOrder
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 5629f4bc252698a102a1b581c3db0be124a4474a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit d98e5a09fc90d66ed8ba28b6ccd6eef0baea73fa
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Mar 5 13:23:07 2014 +0100

    Bug 11699: change ModReceiveOrder to used named parameters
    
    Test plan:
    prove t/db_dependent/Acquisition.t
    prove t/db_dependent/Acquisition/Invoices.t
    prove t/db_dependent/Acquisition/OrderFromSubscription.t
    
    all should return green.
    
    NOTE: Any error messages are the same between master and this
          patch, and are unrelated to the added/revised tests.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 36fc9a3e641b82cb9ef044c54872f68d5a7ebbf3)
    
    Conflicts:
    	t/db_dependent/Acquisition.t

commit 1904e0c129bed1f8659e53a2fcfffcd1581f4502
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Mar 5 13:07:53 2014 +0100

    Bug 11699: fixed saving notes entered when receiving orders
    
    Revised test plan:
    1/ Create an order with 2 items
    2/ Receive 1 item and enter a note for the order
    3/ Verify the note is not saved
        The note should be visible on the Mod Order Details screen,
        but it isn't there.
    4/ Apply patch
    5/ Receive the second item and enter a note for the order
    6/ Verify the note is correctly saved
        The note is visible on the Mod Order Details screen.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script.
    Works as described. The note now saves correctly and also remains when
    you undo a receipt.
    
    Note: it would be nice to show the note on the receive page as well.
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit ab1a74897efb82b99ed3931dff719bb64b930bc4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Conflicts:
    	t/db_dependent/Acquisition.t

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

Summary of changes:
 C4/Acquisition.pm                                  |   58 +++++++++++-----
 acqui/finishreceive.pl                             |   29 ++++----
 .../prog/en/modules/acqui/orderreceive.tt          |    2 +-
 t/db_dependent/Acquisition.t                       |   70 +++++++++++---------
 t/db_dependent/Acquisition/Invoices.t              |   66 +++++++++---------
 t/db_dependent/Acquisition/OrderFromSubscription.t |   13 +++-
 t/db_dependent/Acquisition/TransferOrder.t         |    7 +-
 7 files changed, 148 insertions(+), 97 deletions(-)


hooks/post-receive
-- 
main Koha release repository