[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.06-3-60-g7cefe48

[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  7cefe4827f23e69336026940fde6137690b46888 (commit)
       via  a2ea33823c9ddac172692fb4c7cced7d74ae6159 (commit)
       via  2dd97f26c1e72bc35e29b1afd1fc38d301c48e9e (commit)
      from  2cdbaae38bf8ce08ec88b8334f7877f10d2784d8 (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 7cefe4827f23e69336026940fde6137690b46888
Author: Marc Véron <veron at veron.ch>
Date:   Mon May 4 11:32:18 2015 +0200

    Bug 14128: Capitalization: Guided Reports - step 2 - Build A Report Title 'Build a report' should display with all steps
    
    The tile displayed only with steps #1 and #2
    
    This patch adds the title to the following steps.
    
    To test:
    Home > Reports
    Click on 'Build new'
    Step through steps 1 - 6
    Verify that title displays with each step.
    
    Sponsored-by: Universidad de El Salvador
    
    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
    Works as advertised.
    
    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 2d3e156bb81c4eafb53fb963262a456dc783d6a8)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit a2ea33823c9ddac172692fb4c7cced7d74ae6159
Author: Marc Véron <veron at veron.ch>
Date:   Mon May 4 11:17:46 2015 +0200

    Bug 14128: Capitalization: Guided Reports - step 2 - Build A Report
    
    To verify and test:
    Go to Home > Reports
    Click on 'Build new'
    Verify that the title in Step 1 and to display with correct capitalization
    
    Sponsored-by: Universidad de El Salvador
    
    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit e01cfc90f95dbddbb2e2db7057bb143b6caff114)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 2dd97f26c1e72bc35e29b1afd1fc38d301c48e9e
Author: Nick Clemens <nick at quecheelibrary.org>
Date:   Sat Feb 7 12:49:29 2015 -0500

    Bug 12911: batch_id for new labels batches can be asssigned to several batches
    
    Currently batch_id is assigned upon creation of a new batch object.  This patch leaves batch_id as 0 at creation and adds a check when adding items.  If batch is new then batch_id is created then
    
    Test plan:
    1 -In one browser window, go to tools->label creator and click the new batch button
    2 - Before adding items, open a new browser, and go tools->label creator and click the new batch button
    3 - Note that both batches have the same number listed
    4 - Add an item to the first batch - you should now see one item in the batch
    5 - Add an item to the second batch, you should see two items in the batch
    6 - Apply patch and repeat steps 1&2
    7 - Note that neither batch lists a batch number
    8 - Add an item to the first batch, you should see one item and a batch number
    9 - Add an item to the second batch, you should see one item and a new batch number
    
    Patch behaves as expected.
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit dedd059ac006eefb9eb89c28dc3581ccaaf71098)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Creators/Batch.pm                                       |   12 +++++++-----
 .../prog/en/modules/labels/label-edit-batch.tt             |    2 +-
 .../prog/en/modules/reports/guided_reports_start.tt        |    6 +++++-
 labels/label-edit-batch.pl                                 |    1 +
 4 files changed, 14 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository