[koha-commits] main Koha release repository branch, new/enh/bug_5917, updated. v3.02.00-1124-g8e00f55

[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, new/enh/bug_5917 has been updated
       via  8e00f55216feb6b160d281b7020639cc27928dd2 (commit)
       via  223436970b44098b97679fc6e696b88eb74f2db3 (commit)
       via  e57dadf762101cfb7371c3d2c93e8163a2ace69f (commit)
       via  e1760e84630912b01c53559d3fc4eeb5a80325f3 (commit)
       via  48ee1dcb3f835fb8250bcdd781085521411e6c26 (commit)
       via  88cb47339a8eab4ff4b95956207bf2d1dcdffeff (commit)
       via  268f860e24171f3c5fe5f4b2c4a752e7c5abd5c1 (commit)
       via  735d986a0c976a888948ddd912917ad091267b7e (commit)
       via  84e43e06155e107e3965f06ea5ba37cc5d1b7d30 (commit)
       via  51604b548756fbf74620061a779d0182167c36f3 (commit)
       via  813f5c3f5164707041fcaa90839f4368355eb8e9 (commit)
       via  c12660a4b3e49383cc3dc9e4953aa6d88b1a26d5 (commit)
       via  f144af1a958acb36cf7bbf2b745e62a4656913d0 (commit)
       via  5a89ef7ea5733ba8c8ff4c49efebb3ab8d760eda (commit)
       via  5d43524cdbc2c9fa4b5de83dcb9d51f9a154efc2 (commit)
       via  c83589e0e18e6eece98b3cfe713a646ab6b55c0f (commit)
       via  091d3100169a12e9498f6d58c8b61ac01a5a5db6 (commit)
      from  86e2fbbe49cd0c7b0203b3f179cd9280b14ff404 (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 8e00f55216feb6b160d281b7020639cc27928dd2
Merge: 86e2fbbe49cd0c7b0203b3f179cd9280b14ff404 223436970b44098b97679fc6e696b88eb74f2db3
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Mar 30 20:53:45 2011 +1300

    Merge remote branch 'kc/master' into new/enh/bug_5917
    
    Conflicts:
    	installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql

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

Summary of changes:
 C4/Circulation.pm                                  |  195 +++++++++++++++-----
 C4/Members.pm                                      |   21 ++
 C4/Search.pm                                       |    8 +-
 admin/categorie.pl                                 |   15 +-
 admin/smart-rules.pl                               |   20 ++-
 admin/systempreferences.pl                         |    2 -
 catalogue/detail.pl                                |   16 ++-
 catalogue/moredetail.pl                            |   24 ++-
 catalogue/search.pl                                |    4 +-
 circ/circulation.pl                                |   18 +--
 installer/data/mysql/de-DE/mandatory/sysprefs.sql  |    3 +-
 installer/data/mysql/en/mandatory/sysprefs.sql     |    3 +-
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |    4 +-
 installer/data/mysql/it-IT/necessari/sysprefs.sql  |    5 +-
 installer/data/mysql/kohastructure.sql             |    3 +
 installer/data/mysql/pl-PL/mandatory/sysprefs.sql  |    3 +-
 ...m_preferences_full_optimal_for_install_only.sql |    3 +-
 ...m_preferences_full_optimal_for_install_only.sql |    3 +-
 installer/data/mysql/updatedatabase.pl             |   32 ++++
 .../prog/en/modules/admin/aqbudgets.tmpl           |    4 +-
 .../prog/en/modules/admin/categorie.tmpl           |   12 ++
 .../en/modules/admin/preferences/circulation.pref  |   10 -
 .../en/modules/admin/preferences/staff_client.pref |    6 +
 .../prog/en/modules/admin/smart-rules.tmpl         |   38 ++++-
 .../prog/en/modules/catalogue/detail.tmpl          |    7 +-
 .../prog/en/modules/catalogue/moredetail.tmpl      |    3 +-
 .../prog/en/modules/circ/circulation.tmpl          |    2 +-
 .../prog/en/modules/circ/view_holdsqueue.tmpl      |    4 +-
 .../prog/en/modules/help/acqui/acqcontract.tmpl    |   19 ++
 .../prog/en/modules/help/acqui/acqui-home.tmpl     |   18 +-
 .../prog/en/modules/help/acqui/basket.tmpl         |  111 ++++++++++--
 .../prog/en/modules/help/acqui/basketgroup.tmpl    |   12 ++
 .../prog/en/modules/help/acqui/basketheader.tmpl   |   16 ++
 .../prog/en/modules/help/acqui/booksellers.tmpl    |   59 +------
 .../prog/en/modules/help/acqui/lateorders.tmpl     |   18 +-
 .../prog/en/modules/help/acqui/neworderbiblio.tmpl |   15 ++
 .../prog/en/modules/help/acqui/neworderempty.tmpl  |   17 +--
 .../en/modules/help/acqui/newordersuggestion.tmpl  |   11 +
 .../prog/en/modules/help/acqui/orderreceive.tmpl   |   30 ++--
 .../prog/en/modules/help/acqui/parcel.tmpl         |   37 ++---
 .../prog/en/modules/help/acqui/parcels.tmpl        |   39 ++---
 .../prog/en/modules/help/acqui/supplier.tmpl       |   90 +++++----
 .../prog/en/modules/help/acqui/z3950_search.tmpl   |   17 ++
 .../en/modules/help/suggestion/suggestion.tmpl     |   75 ++------
 .../prog/en/modules/reserve/request.tmpl           |    8 +-
 .../opac-tmpl/prog/en/modules/opac-advsearch.tmpl  |   10 +-
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |    2 +-
 kohaversion.pl                                     |    2 +-
 opac/opac-search.pl                                |    2 +-
 reserve/request.pl                                 |    9 +-
 50 files changed, 689 insertions(+), 396 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tmpl


hooks/post-receive
-- 
main Koha release repository