[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.03-28-gdbc39e4

[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  dbc39e40a49ee01f14bf92c251b4895575e90152 (commit)
       via  d3de39d946f04b9923a5d9249728e5a4e8ff259b (commit)
      from  016b111d4e6281c5d8618acd8a5563f627957952 (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 dbc39e40a49ee01f14bf92c251b4895575e90152
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Jan 29 16:18:19 2015 +0100

    Bug 12860: the export tools explodes if a field is not exported
    
    To reproduce:
    1/ Go on tools/export.pl
    2/ Export some records and specify you don't want the fields 245 (the
    whole field, do not specify a subfield).
    3/ Export, BOOM
    Software error:
    Arguments must be MARC::Field object at /home/koha/src/tools/export.pl line 400.
    
    Test plan:
    Apply the patch and confirm the fields 245 are not exported and the
    export works as expected.
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    
    Export fails to asplode with this patch
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit e2968fe0812898d92ce8c63e9c7f0dedd244acc9)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit d3de39d946f04b9923a5d9249728e5a4e8ff259b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Nov 17 17:17:49 2014 +0100

    Bug 13270: Don't display "vendor note" label if nothing to display
    
    Bug 12111 removes the vendor note edition on receiving.
    The label should not be displayed when it's empty.
    
    Test plan:
    1/ Receive an order without a vendor note and verify that the label is not
    displayed.
    2/ Receive an order with a vendor note and verify that the note is
    displayed.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Works as described, small template change.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 1c62f1a9783bb8a171352e0b66d910056ccfe0d4)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt |    4 +++-
 tools/export.pl                                               |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository