[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.05-2-g6c4e68b

[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.20.x has been updated
       via  6c4e68b2da07fb9e1ae6b3f1d6c77a0b0b141093 (commit)
       via  b94d2d97d2c0e852649e7be1de4acb2ca4f0e81d (commit)
      from  d5402f3d2797c4697c75177cd52168bbd430a9de (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 6c4e68b2da07fb9e1ae6b3f1d6c77a0b0b141093
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 15 11:30:17 2015 +0200

    Bug 10181: Acq - Improve message for deleted records
    
    There are some issues here:
    1/ Message not translatable (set in the pl file)
    2/ ' by 'displayed even if no author defined
    3/ Message not the same every where
    4/ Nothing displayed on the invoice page
    
    Test plan:
    1/ Create a basket
    2/ Add 4 orders A, B, C, D
    3/ On the basket, you see "$title by $author", or "$title" if no author
    defined
    4/ Delete order A, B
    5/ Close the basket
    6/ Receive B, C
    7/ Delete record created for A, C
    8/ Go on the basket page, you should see the title and "Deleted
    bibliographic record, can't find title" for the deleted record
    9/ Go on the invoice page, you should see the title and "Deleted
    bibliographic record, can't find title" for the deleted record
    
    Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 431d217a5185af747a8e80080cb1f381585471fc)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit b94d2d97d2c0e852649e7be1de4acb2ca4f0e81d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 15 10:54:48 2015 +0200

    Bug 10181: Make string translatable
    
    Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 49f2837b2e75511becd09059db99d209917647a7)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 acqui/basket.pl                                          |    2 --
 acqui/invoice.pl                                         |    2 --
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt  |   11 ++++++++---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt |   10 +++++++---
 4 files changed, 15 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
main Koha release repository