[koha-commits] main Koha release repository branch 3.8.x updated. v3.08.13-20-gc6d3b9b

Git repo owner gitmaster at git.koha-community.org
Mon Jun 17 09:43:31 CEST 2013


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.8.x has been updated
       via  c6d3b9bbe212725e660c563ecf8198fb201827d4 (commit)
       via  c526912cc6c6a733a4495a4d341891221b707f9f (commit)
       via  b5ee276f9f9afcc002d7fe122fe22e4cb2f829f6 (commit)
      from  34bcbce85138aa01b6092f889aee4bb8b5683113 (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 c6d3b9bbe212725e660c563ecf8198fb201827d4
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Fri May 17 21:12:05 2013 +0200

    Bug 9824: Make it possible to apply/cancel switch
    
    Using another existing string 'Apply filter' we are now
    able to cancel the filter... and apply it... and cancel it
    again... and so on.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit 7acdcb7e2aedf2ff202c009ce053de6dff54e840)
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit 6bfb91f9df69c887643d0f1ae925595c365da10e)
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    (cherry picked from commit 6bfb91f9df69c887643d0f1ae925595c365da10e)
    
    Signed-off-by: Chris Hall <followingthepath at gmail.com>
    (cherry picked from commit b3fe1c1b93bd8f825dfe59659fd83bfb23f904cf)

commit c526912cc6c6a733a4495a4d341891221b707f9f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri May 17 19:01:06 2013 +0200

    Bug 9824: Followup for removing filter
    
    Adds allbaskets parameter to GetBasketsInfosByBookseller. (Only used in booksellers.pl now)
    Normally, all 'active' baskets are shown. With allbaskets=1 all baskets :)
    In the template I had to rename a loop var supplier to supplier1 to resolve
    name conflict between template vars.
    In the template I added the string: Cancel filter.
    Note that this string is already translated:
    msgid "Cancel filter"
    msgstr ""
    Hope this helps.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Undoing the filter works and I checked that the string gets
    translated with the po files in current master.
    So this is almost perfect, only we can't apply the filters
    again and the link remains 'cancel' when we already did.
    Sending a follow-up trying to fix this.
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit 529434cab891a8b76b3792e12e359f8c8b171519)
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit a114dc76149c9c27d5b3e0596302d41a9870fc8b)
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    (cherry picked from commit a114dc76149c9c27d5b3e0596302d41a9870fc8b)
    
    Signed-off-by: Chris Hall <followingthepath at gmail.com>
    (cherry picked from bf47671bace7ff55af53694cd8165f0acf0a5966)

commit b5ee276f9f9afcc002d7fe122fe22e4cb2f829f6
Author: Lyon3 Team <koha at univ-lyon3.fr>
Date:   Thu Mar 21 14:47:43 2013 +0100

    Bug 9824 - Hide basket with no expected items in basqket list by bookseller
    
    Before patch you will see in acqui/booksellers.pl all the baskets ever
    created.
    After the patch you will see in acqui/booksellers.pl only the basket
    with expected items.
    
    Test plan :
    * Create a basket with some orders lines
    You should see this basket in acqui/booksellers.pl
    * receive or cancel all the line in this basket
    This basket shouldn't appear any more in acqui/booksellers.pl
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit a0a6d6e64bca28b4d9bc668f614ed286b07327f9)
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit e1dbabdb7a3bc0ec92d629b862a077f1b6594fbb)
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    (cherry picked from commit e1dbabdb7a3bc0ec92d629b862a077f1b6594fbb)
    
    As this is requested, and applies well in 3.10.x, I push it with
    it's followups.
    
    Signed-off-by: Chris Hall <followingthepath at gmail.com>
    (cherry picked from commit c80b91c3e0114dae1d09a158baa4cc8c81ac62ee)

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

Summary of changes:
 C4/Acquisition.pm                                  |   11 +++++++----
 acqui/booksellers.pl                               |    4 +++-
 .../prog/en/modules/acqui/booksellers.tt           |   11 +++++++++--
 3 files changed, 19 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list