[koha-commits] main Koha release repository branch master updated. v3.12.00-alpha2-165-g8a97ab0

[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, master has been updated
       via  8a97ab05a8923f81d88f209a74aa88b9d466dca8 (commit)
       via  d7072455cbe5f13fd884ce9f8cfd3bdd7c5441bb (commit)
       via  8a5cef42428c135ad70ae34d6fcde7ddf5c8762e (commit)
       via  6c4da573dbe3636e06b3b4b9f379f52f1f6eb345 (commit)
       via  f634c4cfb1cea4742cbd9cf7812eb7e671a1407c (commit)
       via  c28f7d7de5d1e1a8d5e0038b76fce74397c3c489 (commit)
       via  3cd9293b6a89faf4cd4308ea0f411770e779ce34 (commit)
       via  44d285b1c56503cffe20f5fe8a47e58363acb2d9 (commit)
       via  de93edb6a54419e958c7e97648da3326b859026f (commit)
       via  7f9c747a3c8c4711d3f2e909677a6a049dd3d95d (commit)
       via  3aef36106541974f0897b68f469a69ea72742642 (commit)
       via  8e978c7ce0edd51ee52ffb977dd1361ae3177311 (commit)
       via  5eceb4706ba8ea16bf655a5e9a24ecfc5f90e2c2 (commit)
       via  bd83d0531685b5cce3ed7de6c9b12744d9245c9e (commit)
       via  ed63c139576138e870211dddf327227f2b824fac (commit)
      from  92433747b54ff3b91a0e301ea57e488ab26f74a3 (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 8a97ab05a8923f81d88f209a74aa88b9d466dca8
Merge: 6c4da57 d707245
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Sat Mar 23 00:29:15 2013 -0400

    Merge branch 'bug_9506' into 3.12-master

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

Summary of changes:
 C4/Acquisition.pm                                  |   63 ++++++++++-
 C4/Budgets.pm                                      |   23 ++++
 C4/Serials.pm                                      |   25 ++++-
 acqui/addorder.pl                                  |    1 +
 acqui/basketgroup.pl                               |  117 +++++++++++---------
 acqui/finishreceive.pl                             |    1 -
 acqui/neworderempty.pl                             |   32 +++++-
 acqui/newordersubscription.pl                      |  107 +++++++++++++++++
 acqui/orderreceive.pl                              |    1 +
 acqui/pdfformat/layout2pages.pm                    |   22 ++--
 acqui/pdfformat/layout3pages.pm                    |   80 +++++++++----
 installer/data/mysql/kohastructure.sql             |    7 +-
 installer/data/mysql/updatedatabase.pl             |   11 ++
 .../lib/jquery/plugins/jquery.validate.min.js      |    4 +
 .../intranet-tmpl/prog/en/css/staff-global.css     |   11 ++-
 .../en/includes/acquisitions-add-to-basket.inc     |   19 ++-
 .../prog/en/includes/doc-head-close.inc            |    2 +
 .../prog/en/includes/subscriptions-search.inc      |   54 +++++++++
 .../prog/en/includes/validator-strings.inc         |   23 ++++
 koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js |    2 +
 .../prog/en/modules/acqui/neworderempty.tt         |  103 ++++++++++-------
 .../prog/en/modules/acqui/newordersubscription.tt  |  120 ++++++++++++++++++++
 .../prog/en/modules/acqui/orderreceive.tt          |   58 +++++----
 .../prog/en/modules/admin/branches.tt              |   16 ++--
 .../prog/en/modules/serials/serials-home.tt        |    1 +
 .../prog/en/modules/serials/subscription-detail.tt |    6 +-
 kohaversion.pl                                     |    2 +-
 serials/serials-search.pl                          |    2 +-
 serials/subscription-detail.pl                     |   94 +++++++++++-----
 29 files changed, 787 insertions(+), 220 deletions(-)
 create mode 100755 acqui/newordersubscription.pl
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.validate.min.js
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/validator-strings.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt


hooks/post-receive
-- 
main Koha release repository