[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.00-18-gb3676c3

[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.14.x has been updated
       via  b3676c33d0016a8ea3deb3c0c89499a9dff93b11 (commit)
       via  dcc14ac80221173da6ea1664cb84ecb82126da7a (commit)
      from  08c8bead4659477978114ede89801b71cbaca31e (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 b3676c33d0016a8ea3deb3c0c89499a9dff93b11
Author: Fridolin SOMERS <fridolin.somers at biblibre.com>
Date:   Fri Dec 13 12:01:58 2013 +0100

    Bug 11040: DBRev 3.14.00.001
    
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

commit dcc14ac80221173da6ea1664cb84ecb82126da7a
Author: Peggy Thrasher <p.thrasher at dover.nh.gov>
Date:   Thu Nov 7 18:49:51 2013 -0500

    Bug 11040: Add CircAutoPrintQuickSlip option to print regular slip
    
    This patch adds a third option to the CircAutoPrintQuickSlip system
    preference.  The three options are now:
    
    * print quick slip
    * print regular slip
    * clear the screen
    
    Test plan:
    1.  Set the System Preference for CircAutoPrintQuickSlip to "clear the
        screen".
        Enter a borrower barcode for checkout
        Press Enter
        The screen should be cleared.
    
    2.  Set the System Preference for CircCircAutoPrintQuickSlip to "open a
        quick slip window"
        Enter a borrower barcode for checkout
        Press Enter
        A Quick slip is printed.
    
    3.  Apply the patch
        Update the database using UpdateDatabase.pl
    
    4.  Set the System Preference for CircAutoPrintQuickSlip to "clear the
        screen".
        Enter a borrower barcode for checkout
        Press Enter
        The screen should be cleared.
    
    5.  Set the System Preference for CircCircAutoPrintQuickSlip to "open a
        quick slip window"
        Enter a borrower barcode for checkout
        Press Enter
        A Quick slip is printed.
    
    6.  Set the System Preference for CircCircAutoPrintQuickSlip to "open a
        slip window"
        Enter a borrower barcode for checkout
        Press Enter
        A Slip is printed.
    
    7.  Reload the database using sysprefs.sql
        Set the System Preference for CircAutoPrintQuickSlip to "clear the
        screen".
        Enter a borrower barcode for checkout
        Press Enter
        The screen should be cleared.
    
    8.  Set the System Preference for CircCircAutoPrintQuickSlip to "open a
        quick slip window"
        Enter a borrower barcode for checkout
        Press Enter
        A Quick slip is printed.
    
    9.  Set the System Preference for CircCircAutoPrintQuickSlip to "open a
        slip window"
        Enter a borrower barcode for checkout
        Press Enter
        A Slip is printed.
    
    10.  Verify that the Checkout Help includes information about printing Slips.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 2131c78618bb8851bc37bc99f20fa1aaa02c3124)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
    
    Conflicts:
    	installer/data/mysql/updatedatabase.pl

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

Summary of changes:
 installer/data/mysql/sysprefs.sql                             |    2 +-
 installer/data/mysql/updatedatabase.pl                        |    9 +++++++++
 .../prog/en/modules/admin/preferences/circulation.pref        |    5 +++--
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt   |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/circ/circulation.tt    |    2 +-
 kohaversion.pl                                                |    2 +-
 6 files changed, 17 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository