[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.04-49-g4936aba

[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.18.x has been updated
       via  4936aba7a6cd27ae8bc757c3c880ef9a3f98cb5b (commit)
       via  d04a97a342cdee046df8bc53924180cb6adf714b (commit)
      from  b4d77d7c78c847a6e4fc62e36a80a3a1ad688058 (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 4936aba7a6cd27ae8bc757c3c880ef9a3f98cb5b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Feb 25 13:21:07 2015 +0100

    Bug 13746: Add tests
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 476febe5db9eb11db4b3945bdd1025a88b5f16f4)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Conflicts:
    	t/db_dependent/Serials.t

commit d04a97a342cdee046df8bc53924180cb6adf714b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sat Feb 21 22:52:30 2015 +0100

    Bug 13746: On creating a new subscription, notes fields get confused
    
    For every subscription we have 4 notes fields in Koha, 2 are in the
    subscription itself and another 2 are in the subscription history.
    
    When creating a new subscription, the notes fields from the
    subscription get copied to the fields of the subscription history,
    leading to doubled up display of notes in the OPAC.
    
    To test:
    - Add a new subscription without patch
      - check manual history
      - Fill in both notes fields
    - Verify that the notes fields got also saved into the
      subscription history (easy from the Summary tab)
    - Apply patch
    - Add another subscription, like above
    - Verify now only the subscription notes fields are saved
    - Edit subscription and notes - verify all is ok
    - Edit subscription history (Planning tab) - verify all is ok
    
    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit b5fac05bc39188081c14dcafb7f4c3a0969d37a3)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Serials.pm            |    6 +++---
 t/db_dependent/Serials.t |   19 ++++++++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository