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

[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  363ea5ce08c6e7c729a3d407b498bf89ea8a9d25 (commit)
       via  4273c02ba1c0d71bb07c3a0b33ce76fae72a5917 (commit)
       via  f1869ec06407dcca8c8d29cf06fd342b203ee758 (commit)
       via  ef9c269d7a13ab8553b41005574bc65818d9821e (commit)
       via  5bcb1529bc3354c9694cae1a5746db534542ec60 (commit)
       via  0ccc89990b15207655ca2ba6630722da455c41dd (commit)
       via  e9f8f44dd4a042cfe6dd042adbd2dafcf49f60a9 (commit)
       via  ff17b6b26f483810cf1e5576175070fa0b751939 (commit)
       via  6a7470341a0a6cf151d4ac360dd204779bbd3dab (commit)
       via  1f323c00a14673ae83ae24b2502aa172d7949781 (commit)
       via  3603ae6274da149370fd38ce642848738b11fcdc (commit)
       via  0dba0e0d3c687ffa0c8ba64ddf5c5f217c68aa0a (commit)
       via  5910b59d1d4bdbe6fb6152453536bfe64d490c01 (commit)
       via  4f2dbc193b8e07e17a1a718cbabe581811fcaaa7 (commit)
       via  88b3711ca918877796d8577c54efe3f0aba96673 (commit)
       via  ff8ad64c2797d73464ef9009acba8744922fc61f (commit)
       via  09e2ee605845e9cb03f21f2596404d60d1e9fc74 (commit)
       via  a56e1e1729fbbc1b341bbad7c2fcf94d4642806f (commit)
       via  7003c743213e48ddd5d8e35006d75f7be8970d9d (commit)
       via  a8ffb2273b63c398492a7cbd08394adedb2aeadb (commit)
       via  f22b8bcd458df8d8fad29070a7b95a63b6d356a2 (commit)
       via  9dc69cf47fb374b64dcc2ee3716cffa3b15cfb7c (commit)
       via  b9d434c18f3ff5a4d168cf24454d51ede1523fde (commit)
       via  26a1a538a46f5735eace65441d66767c7b711957 (commit)
       via  b3efa877e7d0138340b3231d62ca0196731695ef (commit)
       via  e1a0b4ab53598cdf44a6635d8c7e2e91dad4c26f (commit)
       via  ead56def261db6da1610e1367e2ff69cb92ba088 (commit)
       via  f0b17df29abf48ae8b354242e182770f370d76e8 (commit)
       via  b025403baa837754b3bfff00a931ad9b91f31274 (commit)
      from  ee138c16b44b0b5546df4c8d18342c349580be87 (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 363ea5ce08c6e7c729a3d407b498bf89ea8a9d25
Merge: 4273c02ba1c0d71bb07c3a0b33ce76fae72a5917 f1869ec06407dcca8c8d29cf06fd342b203ee758
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Apr 5 15:39:12 2011 +1200

    Merge remote branch 'kc/master' into new/enh/bug_5917
    
    Conflicts:
    	installer/data/mysql/updatedatabase.pl

commit 4273c02ba1c0d71bb07c3a0b33ce76fae72a5917
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Apr 5 15:35:44 2011 +1200

    Bug 5917 : Scoping

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

Summary of changes:
 C4/Auth.pm                                         |   17 +++++-
 C4/Budgets.pm                                      |   21 ++++----
 C4/Installer/PerlDependencies.pm                   |    5 ++
 C4/Members/AttributeTypes.pm                       |   18 ++++++-
 C4/Members/Attributes.pm                           |   24 ++++++++-
 C4/Search.pm                                       |    2 +
 C4/Suggestions.pm                                  |   15 +++++-
 acqui/neworderempty.pl                             |    1 +
 acqui/parcel.pl                                    |    1 +
 admin/aqbudgets.pl                                 |    2 +-
 etc/zebradb/biblios/etc/bib1.att                   |    1 +
 etc/zebradb/ccl.properties                         |    2 +
 etc/zebradb/marc_defs/marc21/biblios/record.abs    |    7 ++-
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    1 +
 .../marc21/optional/marc21_fastadd_framework.sql   |    1 +
 .../optional/marc21_simple_bib_frameworks.sql      |   10 +++-
 installer/data/mysql/en/mandatory/auth_values.sql  |    2 +
 installer/data/mysql/en/mandatory/auth_values.txt  |    1 +
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    1 +
 .../marc21/optional/marc21_fastadd_framework.sql   |    1 +
 .../optional/marc21_simple_bib_frameworks.sql      |    8 +++
 .../data/mysql/en/optional/patron_atributes.sql    |    2 +
 .../data/mysql/en/optional/patron_atributes.txt    |    2 +
 .../Obligatoire/marc21_framework_DEFAULT.sql       |    1 +
 .../Optionnel/marc21_simple_bib_frameworks.sql     |    8 +++
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    1 +
 .../marc21/optional/marc21_fastadd_framework.sql   |    1 +
 .../optional/marc21_simple_bib_frameworks.sql      |    8 +++
 installer/data/mysql/kohastructure.sql             |    2 +-
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    1 +
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    1 +
 .../marc21/optional/marc21_fastadd_framework.sql   |    1 +
 .../optional/marc21_simple_bib_frameworks.sql      |    8 +++
 installer/data/mysql/updatedatabase.pl             |   18 ++++++
 koha-tmpl/intranet-tmpl/prog/en/js/acq.js          |    2 +-
 .../prog/en/modules/acqui/neworderempty.tmpl       |   58 +++++++++++++++++---
 .../prog/en/modules/acqui/parcel.tmpl              |   17 ++++--
 .../prog/en/modules/admin/preferences/admin.pref   |    1 +
 .../prog/en/modules/admin/preferences/serials.pref |   10 +++-
 .../cataloguing/value_builder/marc21_field_006.xml |    4 +-
 .../prog/en/modules/suggestion/suggestion.tmpl     |   11 +++-
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |   11 ++++
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl |    6 ++-
 .../prog/en/modules/catalogue/results.tt           |   14 +++---
 kohaversion.pl                                     |    2 +-
 opac/opac-user.pl                                  |   15 +++++-
 suggestion/suggestion.pl                           |   15 ++++--
 48 files changed, 305 insertions(+), 58 deletions(-)
 create mode 100644 installer/data/mysql/en/mandatory/auth_values.sql
 create mode 100644 installer/data/mysql/en/mandatory/auth_values.txt
 create mode 100644 installer/data/mysql/en/optional/patron_atributes.sql
 create mode 100644 installer/data/mysql/en/optional/patron_atributes.txt


hooks/post-receive
-- 
main Koha release repository