[koha-commits] updated branch master (f1e577464a4c88ff06267fc1be59103939494f68)

[Koha Gitosis]

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 "Koha GitWeb".

The branch, master has been updated
       via  f1e577464a4c88ff06267fc1be59103939494f68 (commit)
       via  66c693d96b6b032580098dbbd1f505152e2fefa3 (commit)
       via  011ff56bd673970118f1c27effaf15da0c24d8a3 (commit)
       via  d6aed5f0d081af8d7229fe6b3fc9ea029f719e51 (commit)
       via  f34da84ed6d439e7b2d1f9f1efd4bac8243e8749 (commit)
       via  63e871dd401c33f288202358639bf098af596148 (commit)
       via  b7e35a37256054c2a1d07a4fcd965283aa91968e (commit)
       via  68bbe0d5964880c617be622c7d32dad633d515a7 (commit)
       via  af5ad339f71d80a48baad81d8038e58b1043d731 (commit)
      from  e3421f0f9f24f55dd5d7a418837f581e87ea75dd (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 f1e577464a4c88ff06267fc1be59103939494f68
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Tue Mar 16 20:11:14 2010 -0400

    bug 3482: add PrintNoticesMaxLines to new syspref editor
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit 66c693d96b6b032580098dbbd1f505152e2fefa3
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Tue Mar 16 20:03:44 2010 -0400

    bump up DBrev to 125
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit 011ff56bd673970118f1c27effaf15da0c24d8a3
Merge: e3421f0f9f24f55dd5d7a418837f581e87ea75dd d6aed5f0d081af8d7229fe6b3fc9ea029f719e51
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Tue Mar 16 20:02:31 2010 -0400

    Merge branch 'Bug3482' of git://github.com/ptfs/Koha-PTFS into to-push
    
    * 'Bug3482' of git://github.com/ptfs/Koha-PTFS:
      Bug 3482: Updated DB version
      Bug 3482 changed name of notices file
      Bug 3482 Allow hold notices to be sent in print form
      Add expiration date, today to hold notices
      Modified to use dirspec only
      Bug 3482 Print Notices via HTML

commit d6aed5f0d081af8d7229fe6b3fc9ea029f719e51
Author: J. David Bavousett <dbavousett at ptfs.com>
Date:   Mon Feb 22 11:02:01 2010 -0500

    Bug 3482: Updated DB version
    
    Updated DB version and inserted mandatory SQL for this series of patches.

commit f34da84ed6d439e7b2d1f9f1efd4bac8243e8749
Author: J. David Bavousett <dbavousett at ptfs.com>
Date:   Fri Aug 21 14:40:29 2009 -0400

    Bug 3482 changed name of notices file

commit 63e871dd401c33f288202358639bf098af596148
Author: Jesse Weaver <pianohacker at gmail.com>
Date:   Thu Jun 11 14:49:15 2009 -0600

    Bug 3482 Allow hold notices to be sent in print form
    
    This is done by saving the notices in the message_queue table with
    type 'print'. The notices are generated from a notice named
    HOLD_PRINT. At the end of the day, they are dumped to an HTML file and
    marked as sent by a new cronjob.
    
    This setup is intended to be temporary; modules/batch/ shouldn't be around
    forever.
    
    Mandatory SQL:
    INSERT INTO message_transport_types (message_transport_type) values ('print');

commit b7e35a37256054c2a1d07a4fcd965283aa91968e
Author: Jesse Weaver <pianohacker at gmail.com>
Date:   Thu Jun 11 11:40:01 2009 -0600

    Add expiration date, today to hold notices
    
    This adds the new, virtual placeholders <<today>> and
    <<reserves.expirationdate> that can be used in letter templates.

commit 68bbe0d5964880c617be622c7d32dad633d515a7
Author: J. David Bavousett <dbavousett at ptfs.com>
Date:   Wed Oct 14 08:19:37 2009 -0400

    Modified to use dirspec only
    
    This commit modifies overdue_notices so that the -html parameter
    only requires a directory specification.

commit af5ad339f71d80a48baad81d8038e58b1043d731
Author: Kyle M Hall <kyle.m.hall at gmail.com>
Date:   Mon Feb 22 10:21:31 2010 -0500

    Bug 3482 Print Notices via HTML
    
    Modified overdue_notices.pl to support output of html for printing.
    The -html option will e-mail notices to those with e-mail, and output
    html to print for borrowers without e-mail.
    
    When system preference PrintNoticesMaxLines is set to a positive
    integer, it will limit the number of items on the notice to that
    number, and append a message to the end telling the borrower to
    check his or her account for the full listing of items.  This only
    affects print notices, not emailed ones.
    
    Mandatory SQL:
    
    INSERT INTO `systempreferences`
      ( `variable` , `value` , `options` , `explanation` , `type` ) i
      VALUES ( 'PrintNoticesMaxLines', '0', '', i
      'If greater than 0, sets the maximum number of lines an overdue notice will print. If the number of items is greater than this number, the notice will end with a warning asking the borrower to check their online account for a full list of overdue items.',
      'Integer' );
    
    Conflicts:
    
    	installer/data/mysql/en/mandatory/sysprefs.sql
    	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
    	misc/cronjobs/overdue_notices.pl

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

Summary of changes:
 C4/Letters.pm                                      |   38 ++++++++-
 C4/Reserves.pm                                     |   44 ++++++++--
 .../mysql/en/mandatory/message_transport_types.sql |    1 +
 installer/data/mysql/en/mandatory/sysprefs.sql     |    1 +
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |    1 +
 installer/data/mysql/updatedatabase.pl             |   12 +++
 .../en/modules/admin/preferences/circulation.pref  |    5 +
 .../prog/en/modules/batch/print-notices.tmpl       |   24 +++++
 kohaversion.pl                                     |    2 +-
 misc/cronjobs/gather_print_notices.pl              |   90 ++++++++++++++++++++
 misc/cronjobs/overdue_notices.pl                   |   67 ++++++++++++++-
 11 files changed, 268 insertions(+), 17 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tmpl
 create mode 100755 misc/cronjobs/gather_print_notices.pl


hooks/post-receive
-- 
Koha GitWeb