[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.10-53-g6a57f7f
Git repo owner
gitmaster at git.koha-community.org
Sun Sep 15 00:21:40 CEST 2013
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, 3.10.x has been updated
via 6a57f7f1fa351b5b2cbdcae29c7fb09250a68c04 (commit)
via 0ab311f08c869651846b007e32ae284880c09500 (commit)
via f1686f60c2fa3e1dbdcdc9a5e89a5d33ed60c098 (commit)
via 805849e33e190416545cae9cfc4e690190765627 (commit)
via 23bb4bcb002ef0c79979597a33c1de9ffdf46eab (commit)
via 38e8a13b6ba331207dc7451c676e6aa868e14e79 (commit)
via d5cc7da52ac6d6e0fd21662c4f3ebc24c22d511b (commit)
via 338e966d651ca6c00bd8d04c7d24099ca00d1b84 (commit)
via 17fefb868bddf997d90799de5f9190f330c20aac (commit)
via 567f430df5e2ef1468ac914281cede33786a8b58 (commit)
via 3ae20f0a2de91bfe8318df9a63c2bd73da71de25 (commit)
via 9fc0c233dc5b180c3c7f3d92fdfc383c51bb2825 (commit)
via 749facdebb70a02e8f139efb208681e012c4d429 (commit)
via 346e71cabbdbb6d9a1cd54df7bde7ce4eaf1e0d0 (commit)
via e00366c8914b608832c6da1641f59d13af44777f (commit)
via f02150852c86a86745e30171af2ddb0ae5f9d9de (commit)
from 16fb453b37806299a40a75fe8f50e6cb8d456abe (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 6a57f7f1fa351b5b2cbdcae29c7fb09250a68c04
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sat Aug 17 16:04:34 2013 +0000
Bug 10573: (follow-up) update license and copyright statement
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 971449866fc23ff9c0c083754e4dd9c53d8d4cdc)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit f0203f9e9cc985e6b4eb9fb8d2f99d65d3337973)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit f0203f9e9cc985e6b4eb9fb8d2f99d65d3337973)
commit 0ab311f08c869651846b007e32ae284880c09500
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Thu Aug 8 15:54:22 2013 -0300
Bug 10573: (followup) French translation for printing a basketgroup
small followup to fix tabs
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit a9cd81e6858dda89d95625520108fa0b269ff770)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 25c84440cd1123a0f454d4a7ebb33da4634d76a3)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 25c84440cd1123a0f454d4a7ebb33da4634d76a3)
commit f1686f60c2fa3e1dbdcdc9a5e89a5d33ed60c098
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date: Wed Jul 10 16:57:12 2013 +0200
Bug 10573: French translation for printing a basketgroup
If you want to print a basketgroup with pdf format, it will be in
English. The pdf is done with layout2pages.pm or layout3pages.pm,
which call layout2pages.pdf or layout3pages.pdf.
This patch adds layout3pagesfr.pm in src/acqui/pdfformat/ which
calls layout3pagesfr.pdf.
And adds in basketgroup.pl the check for layout3pagesfr
To use it you have to change the systempreferences to pdfformat::layout3pagesfr
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Comment: Work as described, koha-qa reports some tab errors.
Corrected in a followup.
Please, always add a test plan, it's easier to test.
Test:
1) apply the patch
2) change syspref OrderPdfFormat to pdfformat::layout3pagesfr
3) select a vendor
4) create a basket group (empty works)
5) close basket group
6) print basket group
7) PDF is in french
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
This works nicely, although it would be better if we could
find a more general solution to make the templates editable
and translatable.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit a7fe13a52f320e6aded1f3313f721bd7fd73fb52)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
I don't like the approach, but I wouldn't hold this one until a proper solution comes up.
(cherry picked from commit 5d3f5023019f0d09688ebb44d35259fd2ec9990a)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 5d3f5023019f0d09688ebb44d35259fd2ec9990a)
commit 805849e33e190416545cae9cfc4e690190765627
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Apr 11 12:00:45 2013 +0200
Bug 10028: fix how ModReceiveOrder() calls NewOrder()
In C4::Acquisition::ModReceiveOrder, a call to NewOrder is badly used.
NewOrder returns ($basketno, $ordernumber) but in ModReceiveOrder the
ordernumber is got with
my $ordernumber = NewOrder( $args );
It works because:
sub t{
return ("a", "b");
}
my $a = t();
say $a;
Will display 'b'.
But it is not really clear.
Test plan:
Check that there is no regression for partial receives.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 29689de399a8927547c36e53461c7766ecc604f0)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 27f96f606c90f85756b290e1a832377f5465bf40)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 27f96f606c90f85756b290e1a832377f5465bf40)
commit 23bb4bcb002ef0c79979597a33c1de9ffdf46eab
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Mon Aug 5 20:56:48 2013 -0400
Bug 10686: Remove fields from searches for highlighting
If you do a fielded search like au:smith, "Smith" will not get
highlighted on the results page because the Javascript is looking for
the exact string "au:smith."
To test:
1) Turn on OpacHighlightedWords.
2) Do a simple keyword search.
3) Confirm that the word is highlighted on the results and details page.
4) Do a fielded search by entering au:smith (or whatever).
5) Confirm that the word is highlighted on the results and details page.
6) Sign off.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Passes koha-qa.pl, works as advertised.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit b0ea3be36c8e7ae6dc6f28820b1c26fc909d9039)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit a85f9e1928a89e5c8f01983f1b853b090ec8cd1e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit a85f9e1928a89e5c8f01983f1b853b090ec8cd1e)
commit 38e8a13b6ba331207dc7451c676e6aa868e14e79
Author: root <root at kenza-VirtualBox>
Date: Thu Jul 25 13:47:09 2013 +0200
Bug 10642: fix inappropriate uses of $sth->finish() in C4::RotatingCollections.pm
From the man page
finish()
Indicate that no more data will be fetched from this statement handle
before it is either executed again or destroyed.
You almost certainly do not need to call this method.
Adding calls to "finish" after loop that fetches all rows is a common
mistake, don't do it, it can mask genuine problems like uncaught fetch errors.
To test:
Verify that prove -v t/db_dependent/RotatingCollections.t passes
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Passes koha-qa.pl, passes UT provided by bug 10653
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit d1b3e4ab6b432844e076e1eb0662a9c04a5f412e)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 0311e39c269291156f82393fbb7269caab7b679e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 0311e39c269291156f82393fbb7269caab7b679e)
commit d5cc7da52ac6d6e0fd21662c4f3ebc24c22d511b
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri Aug 16 16:09:13 2013 +0000
Bug 10653: (follow-up) minor tweaks to RotatingCollections tests
- remove unnecessary module import
- use parentheses for all C4 function calls
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 40aa42f31f10acad92da5f2c57319f049fba9289)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 800e1fc6d059b59a6aa0f5f0353c64ea1b606560)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 800e1fc6d059b59a6aa0f5f0353c64ea1b606560)
commit 338e966d651ca6c00bd8d04c7d24099ca00d1b84
Author: Kenza Zaki <kenza.zaki at biblibre.com>
Date: Tue Jul 30 13:43:19 2013 +0200
Bug 10653: add unit tests for C4::RotatingCollections.pm
The tests are wrap in a database transaction.
Test plan:
prove t/db_dependent/RotatingCollections.t
t/db_dependent/RotatingCollections.t .. ok
All tests successful.
Files=1, Tests=41, 20 wallclock secs ( 0.02 usr 0.01 sys + 0.41 cusr 0.02 csys = 0.46 CPU)
Result: PASS
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 12061f44beb46709e03d09f7ff61551fa9297b2e)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit eb0373c7eb6d1f0cb52155709c18e06c09ab55df)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit eb0373c7eb6d1f0cb52155709c18e06c09ab55df)
commit 17fefb868bddf997d90799de5f9190f330c20aac
Author: Marc Veron <veron at veron.ch>
Date: Sun Oct 7 19:54:44 2012 +0200
Bug 8887: only display desired result when doing exact syspref search
This patch fixes an issue where entering the complete name of a system
preference when doing a syspref search in the staff interface resulted
in the display of *all* preferences belonging to the desired one's
module.
Since providing a more specific search string should result in getting
back more specific results, the previous behavior was not intuitive.
Test scenario:
a) In sysprefs, do a search with partial match (e.g. intranetcolor)
-> Result shows one entry: intranetcolorstylesheet
b) Do an exact search. e.g. intranetcolorstylesheet
-> Result shows all Staff Client preferences
Apply patch, test again. Now b) behaves like a).
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Passes koha-qa.pl, works as advertised.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 9bc53a0fccc3b673dca43791ebfcb53fd6e0a9ee)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit a4dbe6821d167908792a7665c492d0e2976aaa0a)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit a4dbe6821d167908792a7665c492d0e2976aaa0a)
commit 567f430df5e2ef1468ac914281cede33786a8b58
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Aug 13 10:05:58 2013 -0400
Bug 9238 - make fund pull down say 'select fund', not 'select budget'
When adding a new order to a basket the fund selection field is labeled
"Fund:" but the default option is "Select a budget." This patch changes
this string to "Select a fund" and also corrects the associated
JavaScript error message text displayed when one doesn't choose a fund.
To test, add an order to basket. The "New order" form should show
"Select a fund" as the default option for "Fund" in the "Accounting
details" section. If you submit the form without selecting a fund the
error message should read "You must select a fund."
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
tests pass
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
String updates only, passes koha-qa.pl
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit dbe233a0e5d86975c28918d8b7023b70bdd29d38)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 10ce9281d7eb63276511e05879af88d807495785)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 10ce9281d7eb63276511e05879af88d807495785)
commit 3ae20f0a2de91bfe8318df9a63c2bd73da71de25
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri Aug 16 15:00:35 2013 +0000
Bug 10481: (follow-up) fix typo in POD
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 1e84b1217afc74f490423538b7b8808e3d34513a)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 5fde0910787f9c36caedfc12bc5af6dfedc7df36)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 5fde0910787f9c36caedfc12bc5af6dfedc7df36)
commit 9fc0c233dc5b180c3c7f3d92fdfc383c51bb2825
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Jul 11 11:45:06 2013 +0200
Bug 10481: Unit tests for C4::Members::AddEnrolmentFeeIfNeeded
prove t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t
t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t .. ok
All tests successful.
Files=1, Tests=3, 0 wallclock secs ( 0.02 usr 0.00 sys + 0.38 cusr
0.01 csys = 0.41 CPU)
Result: PASS
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 1c8efaf3f9b14caf5f6512149d5fcd957bd3e487)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit af6c169f2a68296d99ad7f6908e441ababb79c98)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit af6c169f2a68296d99ad7f6908e441ababb79c98)
commit 749facdebb70a02e8f139efb208681e012c4d429
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Jun 17 14:56:22 2013 +0200
Bug 10481: FIX No enrollment fee when changing patron category.
When a patron changes to a category with enrollment fee, they
are not generated.
Test plan:
- Choose a category without fee (e.g. Kid)
- Add an enrollment fee for another category (e.g. Young adult)
- Choose a kid and change his category to "Young adult".
- Note the warning message "Fees & Charges: Patron has Outstanding fees
& charges of XX" on the check out page.
This patch also moves all instances of adding the enrollment fee
to a new routine in C4::Members, AddEnrolmentFeeIfNeeded(), so
additional tests include:
- Register a new patron and give it a category that has
an enrollment fee. Verify that the fee is charged.
- Renew the patron. Verify that the additional fee is charged.
- Register a new patron with a child patron category.
- Use the 'update child to adult' menu option to change the
patron's category to one that is fee-bearing. Verify that the
enrollment fee was charged.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit f8eb19163bd4e59e99b6dae90a5712b6a7be52f6)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 98397ed4b10b03fb0b00e9550b571c3cc47407dc)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 98397ed4b10b03fb0b00e9550b571c3cc47407dc)
commit 346e71cabbdbb6d9a1cd54df7bde7ce4eaf1e0d0
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Thu Aug 8 09:01:23 2013 -0400
Bug 10703: Document borrower_files table
Add db documentation to borrower_files table.
To test:
apply
review kohastructure.sql to be sure documentation is there
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Comment: No errors. Tested loading on new database.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 09e802c7933073cd98040155b02898ab79739b3a)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 2ba6d6636b6e6eeab554e6793074899fa40be5c8)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 2ba6d6636b6e6eeab554e6793074899fa40be5c8)
commit e00366c8914b608832c6da1641f59d13af44777f
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Thu Aug 8 08:53:58 2013 -0400
Bug 10703: Document quotes table
Add db documentation for the quotes table
To test:
apply patch
review kohastructure.sql to be sure documentation is there
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 6823c745371a115d5bec98beb9d10b59e188c9fe)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 801f9fbdae6ef2158d4a555d3e3bf1a77c33edfd)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 801f9fbdae6ef2158d4a555d3e3bf1a77c33edfd)
commit f02150852c86a86745e30171af2ddb0ae5f9d9de
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Thu Aug 8 08:49:25 2013 -0400
Bug 10703: Add db documentation for biblioimages table
This patch adds db documentation to the biblioimages table.
To test:
Apply patch
Review kohastructure.sql to be sure that the documentation is there
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 801d8237d80d7079f3355da18ef18c60b7f37325)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 6f55deac4a976b59edd13632e11f70cbfbd22642)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 6f55deac4a976b59edd13632e11f70cbfbd22642)
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 3 +-
C4/Members.pm | 65 +++--
C4/RotatingCollections.pm | 18 --
acqui/basketgroup.pl | 2 +-
.../{layout3pages.pm => layout3pagesfr.pm} | 141 ++++++----
admin/preferences.pl | 10 +-
installer/data/mysql/kohastructure.sql | 38 ++--
.../prog/en/modules/acqui/neworderempty.tt | 6 +-
.../intranet-tmpl/prog/pdf/layout3pagesfr.odt | Bin 0 -> 13284 bytes
.../intranet-tmpl/prog/pdf/layout3pagesfr.pdf | Bin 0 -> 24394 bytes
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 1 +
.../prog/en/modules/opac-results-grouped.tt | 1 +
.../opac-tmpl/prog/en/modules/opac-results.tt | 1 +
t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t | 56 ++++
t/db_dependent/RotatingCollections.t | 307 ++++++++++++++++++++
15 files changed, 522 insertions(+), 127 deletions(-)
copy acqui/pdfformat/{layout3pages.pm => layout3pagesfr.pm} (77%)
create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout3pagesfr.odt
create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout3pagesfr.pdf
create mode 100644 t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t
create mode 100644 t/db_dependent/RotatingCollections.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list