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.20.x has been updated
via 9d691b2a85d494b66352d2d3de05480fe170fd89 (commit)
via 4ca1bac3106728450cef9feb9df942e78a1256a9 (commit)
via e5d59cad73a4b6c16aca72bf478ce8df4e5f8f3e (commit)
from 196eb9269b2ff963eff1528a4d8da5b2dac9c328 (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 9d691b2a85d494b66352d2d3de05480fe170fd89
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date: Tue Sep 22 12:11:34 2015 +0100
Bug 4502: Changing wording again...
Signed-off-by: Bernardo Gonzalez Kriegel <bgkrie...@gmail.com>
Just a string patch, others are signed.
No errors
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 379329861d19b178f14d360d9fee2518a462d8a7)
Signed-off-by: Frédéric Demians <f.demi...@tamil.fr>
commit 4ca1bac3106728450cef9feb9df942e78a1256a9
Author: Mark Tompsett <mtomp...@hotmail.com>
Date: Mon Apr 6 19:50:30 2015 -0400
Bug 4502: An attempt to make things more sensible.
The reason the budget_period_id was not defined was because in
two cases it was not passed! This patch adds those missing
parameters. And as a result, cuts out the attempt to default the
authcat to '' unless the budget_period_id is defined.
Additionally, the start and end months don't seem to be passed,
so rather than have it blow up, checking them forces the else
case logic.
budget_period_id is the budget id. If you have two budgets,
you can craft a URL to work with budget_period_id matching
those two ids. Anything else should trigger the new error which
was modified to reflect more of what the problem is.
Follow the test plan in comment #6. Feel free to also to attempt
crafting URLs and triggering errors.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkrie...@gmail.com>
Well, works and does not explode any more
No errors
To trigger the new message simply put /cgi-bin/koha/admin/aqplan.pl
on your staff page, an intriguing 'Planning for by Asort1' appears :)
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit fea7b9b4d444a6bdf3f1326c54eddd68670be7f7)
Signed-off-by: Frédéric Demians <f.demi...@tamil.fr>
commit e5d59cad73a4b6c16aca72bf478ce8df4e5f8f3e
Author: Jonathan Druart <jonathan.dru...@biblibre.com>
Date: Tue Mar 24 15:54:37 2015 +0100
Bug 4502: Catch software error if no active budget defined
TEST PLAN
---------
0) Back up your database.
1) In mysql client:
> DROP DATABASE {your koha database name};
> CREATE DATABASE {your koha database name};
> QUIT;
2) Go to the staff client, and install all the default
and optional things -- except patrons. :)
3) Log into staff client.
4) Create a patron -> New Patron -> Staff
5) Enter data and Save
6) More -> Set Permissions
7) Make superlibrarian
8) Log out
9) Log in as new superlibrarian
10) Acquisitions -> Budgets -> New Budget
11) Enter a non-active budget with some funds.
-- Once saved, it should list in the inactive budgets.
12) Click on the name.
13) Click on one of the Planning submenu options.
14) Click the 'Submit' button in the Filter area.
-- This should trigger the blow up.
15) Apply the patch
16) Repeat steps 12-15
-- The kaboom is avoided and a nice message given.
NOTE: This does not solve all the problems in this ugly, ugly
module area. It does solve the one thing it is meant to:
that nasty kaboom.
Signed-off-by: Mark Tompsett <mtomp...@hotmail.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkrie...@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 0a391237710aec779b000c3dff219e54b22fb76a)
Signed-off-by: Frédéric Demians <f.demi...@tamil.fr>
-----------------------------------------------------------------------
Summary of changes:
admin/aqplan.pl | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
hooks/post-receive
--
main Koha release repository
_______________________________________________
koha-commits mailing list
koha-commits@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits
