[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-27-gbf47671

[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.10.x has been updated
       via  bf47671bace7ff55af53694cd8165f0acf0a5966 (commit)
      from  c80b91c3e0114dae1d09a158baa4cc8c81ac62ee (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 bf47671bace7ff55af53694cd8165f0acf0a5966
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)

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

Summary of changes:
 C4/Acquisition.pm                                  |   12 +++++++-----
 acqui/booksellers.pl                               |    3 ++-
 .../prog/en/modules/acqui/booksellers.tt           |    5 +++--
 3 files changed, 12 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository