[koha-commits] main Koha release repository branch master updated. v3.08.00-849-g659a4aa
Git repo owner
gitmaster at git.koha-community.org
Wed Sep 19 11:55:21 CEST 2012
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 659a4aab574e77e65d8e0eb604763f832a5c0574 (commit)
via 81ba4ca9793501f79d320f3d9e6251c5292ca3d3 (commit)
via 3847f55cc7fcd35c2cadb8108961e05b4d3f637c (commit)
via df104c331c234fe69b854e9f8c4cc66ebd1dfbde (commit)
via 10818eb6f17393fbf37effa8d4d1a5d5967a43db (commit)
via 91e0f358afdbffaab1c8189b01641637002543d8 (commit)
via bf803c521fc4a2320a7bc990bcdcb58f15307a33 (commit)
from 8defeb2bd0449fb57945e54a487249283d64f191 (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 659a4aab574e77e65d8e0eb604763f832a5c0574
Merge: 3847f55 81ba4ca
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Wed Sep 19 11:43:04 2012 +0200
Merge remote-tracking branch 'origin/new/bug_8597'
commit 3847f55cc7fcd35c2cadb8108961e05b4d3f637c
Merge: 10818eb df104c3
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Wed Sep 19 11:36:51 2012 +0200
Merge remote-tracking branch 'origin/new/bug_8597'
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 385 ++++++-
C4/Budgets.pm | 24 +-
acqui/addorderiso2709.pl | 2 -
acqui/finishreceive.pl | 13 +-
acqui/invoice.pl | 227 ++++
acqui/invoices.pl | 157 +++
acqui/orderreceive.pl | 25 +-
acqui/parcel.pl | 293 ++---
acqui/parcels.pl | 68 +-
acqui/spent.pl | 47 +-
catalogue/moredetail.pl | 8 +-
installer/data/mysql/kohastructure.sql | 26 +-
installer/data/mysql/updatedatabase.pl | 60 +
.../prog/en/includes/acquisitions-menu.inc | 1 +
.../prog/en/modules/acqui/histsearch.tt | 6 +-
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 173 +++
.../prog/en/modules/acqui/invoices.tt | 232 ++++
.../prog/en/modules/acqui/orderreceive.tt | 7 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 117 +-
.../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 47 +-
.../intranet-tmpl/prog/en/modules/acqui/spent.tt | 41 +-
.../prog/en/modules/catalogue/moredetail.tt | 8 +-
koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc | 4 +-
.../prog => opac-tmpl/ccsr}/en/lib/greybox/AJS.js | 0
.../ccsr}/en/lib/greybox/AJS_fx.js | 0
.../ccsr}/en/lib/greybox/GreyBox_v5_5.zip | Bin 180408 -> 180408 bytes
.../ccsr/en/lib/greybox/GreyBox_v5_5/LGPL.txt | 502 +++++++
.../ccsr}/en/lib/greybox/GreyBox_v5_5/about.html | 0
.../GreyBox_v5_5/adobe_images/nav_buttons.psd | Bin 165140 -> 165140 bytes
.../en/lib/greybox/GreyBox_v5_5/advance_usage.html | 0
.../ccsr}/en/lib/greybox/GreyBox_v5_5/combiner.py | 0
.../greybox/GreyBox_v5_5/compressing_greybox.html | 55 +
.../GreyBox_v5_5/compression_lib/AJS_minify.py | 0
.../GreyBox_v5_5/compression_lib/__init__.py | 0
.../en/lib/greybox/GreyBox_v5_5/examples.html | 0
.../GreyBox_v5_5/greybox_source/auto_deco.js | 0
.../GreyBox_v5_5/greybox_source/base/AJS.js | 1371 ++++++++++++++++++++
.../GreyBox_v5_5/greybox_source/base/AJS_fx.js | 194 +++
.../GreyBox_v5_5/greybox_source/base/base.css | 0
.../GreyBox_v5_5/greybox_source/base/base.js | 192 +++
.../GreyBox_v5_5/greybox_source/base/indicator.gif | Bin 8238 -> 8238 bytes
.../greybox_source/base/loader_frame.html | 104 ++
.../greybox_source/gallery/g_close.gif | Bin 541 -> 541 bytes
.../greybox_source/gallery/gallery.css | 0
.../GreyBox_v5_5/greybox_source/gallery/gallery.js | 0
.../GreyBox_v5_5/greybox_source/set/next.gif | Bin 528 -> 528 bytes
.../GreyBox_v5_5/greybox_source/set/prev.gif | Bin 525 -> 525 bytes
.../GreyBox_v5_5/greybox_source/set/set.css | 0
.../greybox/GreyBox_v5_5/greybox_source/set/set.js | 101 ++
.../greybox_source/window/header_bg.gif | Bin 1188 -> 1188 bytes
.../GreyBox_v5_5/greybox_source/window/w_close.gif | Bin 74 -> 74 bytes
.../GreyBox_v5_5/greybox_source/window/window.css | 39 +
.../GreyBox_v5_5/greybox_source/window/window.js | 0
.../en/lib/greybox/GreyBox_v5_5/installation.html | 0
.../en/lib/greybox/GreyBox_v5_5/normal_usage.html | 0
.../lib/greybox/GreyBox_v5_5/static_files/help.css | 93 ++
.../lib/greybox/GreyBox_v5_5/static_files/help.js | 0
.../lib/greybox/GreyBox_v5_5/static_files/logo.gif | Bin 4514 -> 4514 bytes
.../GreyBox_v5_5/static_files/night_valley.jpg | Bin 46740 -> 46740 bytes
.../static_files/night_valley_thumb.gif | Bin 4410 -> 4410 bytes
.../static_files/night_valley_thumb.jpg | Bin 2524 -> 2524 bytes
.../lib/greybox/GreyBox_v5_5/static_files/salt.jpg | Bin 54124 -> 54124 bytes
.../GreyBox_v5_5/static_files/salt_thumb.gif | Bin 3061 -> 3061 bytes
.../ccsr/en/lib/greybox}/g_close.gif | Bin 541 -> 541 bytes
.../ccsr}/en/lib/greybox/gb_scripts.js | 0
.../opac-tmpl/ccsr/en/lib/greybox/gb_styles.css | 158 +++
.../ccsr/en/lib/greybox}/header_bg.gif | Bin 1188 -> 1188 bytes
.../ccsr/en/lib/greybox}/indicator.gif | Bin 8238 -> 8238 bytes
.../ccsr/en/lib/greybox/loader_frame.html | 104 ++
.../set => opac-tmpl/ccsr/en/lib/greybox}/next.gif | Bin 528 -> 528 bytes
.../set => opac-tmpl/ccsr/en/lib/greybox}/prev.gif | Bin 525 -> 525 bytes
.../ccsr/en/lib/greybox}/w_close.gif | Bin 74 -> 74 bytes
.../lib/jquery/images/ui-icons_222222_256x240.png | Bin 4369 -> 4369 bytes
.../lib/jquery/images/ui-icons_454545_256x240.png | Bin 4369 -> 4369 bytes
.../opac-tmpl/ccsr/en/lib/jquery/jquery-ui.css | 435 +++++++
.../opac-tmpl/ccsr/en/lib/jquery/jquery-ui.js | 29 +
.../ccsr}/en/lib/jquery/jquery.js | 0
.../en/lib/jquery/plugins/jquery.checkboxes.min.js | 13 +
.../en/lib/jquery/plugins/jquery.dataTables.min.js | 0
.../en/lib/jquery/plugins/jquery.highlight-3.js | 0
.../jquery/plugins/jquery.hoverIntent.minified.js | 9 +
.../en/lib/jquery/plugins/jquery.metadata.min.js | 0
.../ccsr/en/lib/jquery/plugins/jquery.rating.js | 392 ++++++
.../lib/jquery/plugins/jquery.tablesorter.min.js | 0
.../en/lib/jquery/plugins/jquery.tools.min.js | 0
kohaversion.pl | 2 +-
86 files changed, 5443 insertions(+), 321 deletions(-)
create mode 100755 acqui/invoice.pl
create mode 100755 acqui/invoices.pl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/AJS.js (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/AJS_fx.js (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5.zip (100%)
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/greybox/GreyBox_v5_5/LGPL.txt
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/about.html (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/adobe_images/nav_buttons.psd (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/advance_usage.html (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/combiner.py (100%)
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/greybox/GreyBox_v5_5/compressing_greybox.html
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/compression_lib/AJS_minify.py (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/compression_lib/__init__.py (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/examples.html (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/greybox_source/auto_deco.js (100%)
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/greybox/GreyBox_v5_5/greybox_source/base/AJS.js
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/greybox/GreyBox_v5_5/greybox_source/base/AJS_fx.js
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/greybox_source/base/base.css (100%)
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/greybox/GreyBox_v5_5/greybox_source/base/base.js
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/greybox_source/base/indicator.gif (100%)
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/greybox/GreyBox_v5_5/greybox_source/base/loader_frame.html
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/greybox_source/gallery/g_close.gif (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/greybox_source/gallery/gallery.css (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/greybox_source/gallery/gallery.js (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/greybox_source/set/next.gif (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/greybox_source/set/prev.gif (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/greybox_source/set/set.css (100%)
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/greybox/GreyBox_v5_5/greybox_source/set/set.js
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/greybox_source/window/header_bg.gif (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/greybox_source/window/w_close.gif (100%)
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/greybox/GreyBox_v5_5/greybox_source/window/window.css
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/greybox_source/window/window.js (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/installation.html (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/normal_usage.html (100%)
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/greybox/GreyBox_v5_5/static_files/help.css
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/static_files/help.js (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/static_files/logo.gif (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/static_files/night_valley.jpg (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/static_files/night_valley_thumb.gif (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/static_files/night_valley_thumb.jpg (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/static_files/salt.jpg (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/GreyBox_v5_5/static_files/salt_thumb.gif (100%)
copy koha-tmpl/{intranet-tmpl/prog/en/lib/greybox/GreyBox_v5_5/greybox_source/gallery => opac-tmpl/ccsr/en/lib/greybox}/g_close.gif (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/greybox/gb_scripts.js (100%)
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/greybox/gb_styles.css
copy koha-tmpl/{intranet-tmpl/prog/en/lib/greybox/GreyBox_v5_5/greybox_source/window => opac-tmpl/ccsr/en/lib/greybox}/header_bg.gif (100%)
copy koha-tmpl/{intranet-tmpl/prog/en/lib/greybox/GreyBox_v5_5/greybox_source/base => opac-tmpl/ccsr/en/lib/greybox}/indicator.gif (100%)
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/greybox/loader_frame.html
copy koha-tmpl/{intranet-tmpl/prog/en/lib/greybox/GreyBox_v5_5/greybox_source/set => opac-tmpl/ccsr/en/lib/greybox}/next.gif (100%)
copy koha-tmpl/{intranet-tmpl/prog/en/lib/greybox/GreyBox_v5_5/greybox_source/set => opac-tmpl/ccsr/en/lib/greybox}/prev.gif (100%)
copy koha-tmpl/{intranet-tmpl/prog/en/lib/greybox/GreyBox_v5_5/greybox_source/window => opac-tmpl/ccsr/en/lib/greybox}/w_close.gif (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/jquery/images/ui-icons_222222_256x240.png (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/jquery/images/ui-icons_454545_256x240.png (100%)
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/jquery/jquery-ui.css
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/jquery/jquery-ui.js
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/jquery/jquery.js (100%)
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/jquery/plugins/jquery.checkboxes.min.js
copy koha-tmpl/opac-tmpl/{prog => ccsr}/en/lib/jquery/plugins/jquery.dataTables.min.js (100%)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/jquery/plugins/jquery.highlight-3.js (100%)
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/jquery/plugins/jquery.hoverIntent.minified.js
copy koha-tmpl/opac-tmpl/{prog => ccsr}/en/lib/jquery/plugins/jquery.metadata.min.js (100%)
create mode 100644 koha-tmpl/opac-tmpl/ccsr/en/lib/jquery/plugins/jquery.rating.js
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/ccsr}/en/lib/jquery/plugins/jquery.tablesorter.min.js (100%)
copy koha-tmpl/opac-tmpl/{prog => ccsr}/en/lib/jquery/plugins/jquery.tools.min.js (100%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list