[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.00-10-g428467a

[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, 17.05.x has been updated
       via  428467a0228429ba78020e9097ede7c43ad6d04e (commit)
       via  003e52896eeb74ca8c9d9ea253eff4f6022e52c0 (commit)
       via  44a80fe0665c0d375faf6b5bded8a2fe96b5ff24 (commit)
      from  ad741d2512e23746ceb009b2c0a7f57403ab3bb5 (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 428467a0228429ba78020e9097ede7c43ad6d04e
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Tue May 2 01:08:02 2017 +0200

    Bug 11122: Follow up - Fix some display issues and typos
    
    This patch fixes the display of copyrightdate for MARC21 installations.
    As MARC21 already requires you to add punctuation in cataloguing, there
    is usually no need for punctutation in the templates.
    
    Also fixes a template variable name typo and the basket summary page.
    
    To test (all 3 patches):
    - Add several order lines to an order, one should be uncertain
    - Verify that the publisher and publication year are displayed
    - Check the uncertain price page
    - Verify that the publisher code and publication year are displayed
    - Fix uncertain price and close your order
    - Basket summary: Verify... (you know what)
    - Cancel one of your orders
    - Verify... for cancelled orders
    - Receive shipment
    - Verify... for unreceived orders
    - Receive order
    - Verify ... for received orders
    - Finish receiving
    - Verify ... on the invoice summary page
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit cbb5096934907ec56df27d6ee3e77d752cd5e401)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 003e52896eeb74ca8c9d9ea253eff4f6022e52c0
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Sun Apr 19 20:28:21 2015 -0400

    Bug 11122: Address MARC21 vs. UNIMARC issue
    
    In comment #6 and comment #17, Katrin pointed out the discrepancy
    between UNIMARC (using publisheryear) vs. Other MARC installations
    (using copyrightdate). This was dealt with in invoice.tt already.
    This patch does similar logic for the other 3 template files.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit c470b3e38486e3c6040a10f6b0bf90af069f4566)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 44a80fe0665c0d375faf6b5bded8a2fe96b5ff24
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Wed Oct 23 12:05:23 2013 +0200

    Bug 11122 - publisher code and publication year not fetched in acq orders
    
    In acquisition, several templates try to display publisher code and publication year : invoice.tt, parcel.tt, transferorder.tt.
    Thoses pages use C4::Acquisition methods GetPendingOrders or GetInvoiceDetails.
    The bug is that in the SQL query of those methods, biblioitems.publishercode and biblioitems.publicationyear.
    In uncertainprice.pl those datas are fetch using GetBiblioData.
    It whould be better to fetch them in GetPendingOrders and GetInvoiceDetails.
    
    This patch changes SQL queries to fetch wanted datas : aqorders.*,biblio.title,biblio.author,biblioitems.isbn,biblioitems.publishercode,biblioitems.publicationyear. GetInvoiceDetails also needs : biblio.seriestitle,biblioitems.volume.
    This patch also unifies the way biblio datas are displayed :
      <a href="link to catalog using biblionumber">[title]</a> <em>by</em> [author] – [isbn]
      <em>Publisher:</em> [publishercode], [publicationyear]
    
    Test plan :
    - Choose a biblio record containing a data in :
        biblio.title,
        biblio.author,
        biblioitems.isbn,
        biblioitems.publishercode,
        biblioitems.publicationyear,
        biblio.seriestitle,
        biblioitems.volume.
    - Create an order using this biblio.
    - Look at this order in pages : parcel.pl, transferorder.pl, uncertainprice.pl
    => You see publisher code and publication year
    - Look at this order in page : invoice.pl
    => You see publisher code, publication year, series title and volume
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit c59e395b749132080fefb81e5b12f8c0b6654665)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/Acquisition.pm                                  |    3 +++
 acqui/uncertainprice.pl                            |   20 ++------------------
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |    6 ++++--
 .../intranet-tmpl/prog/en/modules/acqui/invoice.tt |   10 ++++------
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |   14 ++++++++++++--
 .../prog/en/modules/acqui/transferorder.tt         |    7 ++++++-
 .../prog/en/modules/acqui/uncertainprice.tt        |   19 ++++++++++++++-----
 7 files changed, 45 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
main Koha release repository