[koha-commits] main Koha release repository branch master updated. v3.18.00-436-ge0863d9
Git repo owner
gitmaster at git.koha-community.org
Wed Mar 11 18:38:45 CET 2015
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 e0863d9711f6e63f627a6cca1450fde481e935e7 (commit)
via 901fdce2c658bb4f19396d23a492e2dc6ce28375 (commit)
via d50163786156b4b4eda37addaeeab957961329d7 (commit)
via 379e9cbe1eac5aca880e193691a3dedf22900c5d (commit)
via c9e4c6b84edffc725e04d25e3ce271e4ec1dc280 (commit)
via 39a03494d8bedb6d2e462c3a5a64411299e0df4c (commit)
via 855c8f47b7ae0fcb37f5aa9b2d9cce99472c5013 (commit)
via 58ee5a15c0d71c584491c635bcac33b90fb84327 (commit)
via a111ffb92e209fbe543eafcf40ecb0957c2f10e1 (commit)
via 105f8f57f2bdd38c96b030f7976bdf1d4c68c994 (commit)
via f027f6b50261d29eb773f6ae1899dad3375790ee (commit)
via 5993857ccaa3ddfb3a51ee9b9f48d878db7f2b7b (commit)
via 1119faf3efa245b39458daf581e23a60b70b576f (commit)
via 481479fe627dcbabb3ef66df0724cc3fe75b110c (commit)
via 8e91a0f01df4a37b36dc3fe27bab3126a0dc8aa8 (commit)
via 753cbc4040344938ba937a9d24ce4b2869a9fecd (commit)
via 519c27364334a1b62dd9acd4a36fbd40b7492475 (commit)
via bb1beb4f5d45fd288ad1ed8cb893b4bd2a01c1db (commit)
via 1072b9267641ab3e51ab5b63319d1d0a2033cae7 (commit)
from 66c9e7a183e8e56c29b34e57d6c3c0b3cee09699 (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 e0863d9711f6e63f627a6cca1450fde481e935e7
Author: Marc Véron <veron at veron.ch>
Date: Tue Feb 10 16:37:41 2015 +0100
Bug 13657 - Don't show extra comma after guarantor name on patron details
This patch suppresses the first name part (including comma) if first name is empty. This way, first name is still displays with natural persons, but not with organizations.
To test:
Apply this patch (without the first patch).
Have one patron with a natural person as guarantor and one patron with an organization as guarantor. Verify that both display properly on the patron details page.
Signed-off-by: Jesse Maseto <Jesse at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 901fdce2c658bb4f19396d23a492e2dc6ce28375
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date: Tue May 6 11:20:59 2014 +0300
Bug 11364: Label layout types and text justification types are not translatable
To test:
1) cd misc/translator
2) perl translate update xx-YY
3) check that there's no msgids that contain the layout types or
text justification types in po/xx-YY-i-staff-t-prog-v-3006000.po
4) apply patch
5) perl translate update xx-YY
6) check po/xx-YY-i-staff-t-prog-v-3006000.po that it contains the
msgid for the frequencies. (search for "BLOCK translate_label_types"
and "BLOCK translate_justification_types")
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit d50163786156b4b4eda37addaeeab957961329d7
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Mar 6 11:08:41 2015 +0100
Bug 13804 - Returns via the checkouts tables uses the phrase "Returned" rather than "Checked in"
Test plan:
1) Apply this patch
2) Return an item via the checkouts table
3) Note the left most column now reads "Checked in" rather than "Returned"
Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 379e9cbe1eac5aca880e193691a3dedf22900c5d
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Thu Mar 5 15:48:45 2015 -0300
Bug 13350: Untranslatable strings in aqbudgetperiods.tt
Counter patch, same test plan as original
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit c9e4c6b84edffc725e04d25e3ce271e4ec1dc280
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed Mar 11 11:59:34 2015 -0300
Bug 12648: DBRev 3.19.00.014
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 39a03494d8bedb6d2e462c3a5a64411299e0df4c
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed Mar 11 11:59:03 2015 -0300
Bug 12648: Add some documentation on the kohastructure.sql file
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 855c8f47b7ae0fcb37f5aa9b2d9cce99472c5013
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Mar 11 16:35:18 2015 +0100
Bug 12648: Fix conflict with bug 8096
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Patch fixes the regression found while testing. Thanks for the fast response Jonathan
commit 58ee5a15c0d71c584491c635bcac33b90fb84327
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed Mar 11 11:52:47 2015 -0300
Bug 12648: (RM followup) DBIx schema update
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a111ffb92e209fbe543eafcf40ecb0957c2f10e1
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Mar 11 15:38:37 2015 +0100
Bug 12648: (QA followup) Rename aqorderusers to aqorder_users
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Thanks Jonathan
commit 105f8f57f2bdd38c96b030f7976bdf1d4c68c994
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jan 9 08:10:10 2015 -0500
Bug 12648: QA Followup
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit f027f6b50261d29eb773f6ae1899dad3375790ee
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Dec 17 09:35:41 2014 +0100
Bug 12648: Add the new 'Acquisition' entry in the letter module list
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 5993857ccaa3ddfb3a51ee9b9f48d878db7f2b7b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Sat Oct 11 15:55:59 2014 +0200
Bug 12648: The patron's name should be the same as before
The displayed patron's name should be surname + firstname
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 1119faf3efa245b39458daf581e23a60b70b576f
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Oct 1 11:17:48 2014 +0200
Bug 12648: Hide the result search on load
When no search has been done yet, it's not necessary to display the
result list.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 481479fe627dcbabb3ef66df0724cc3fe75b110c
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Oct 1 10:46:14 2014 +0200
Bug 12648: Fix conflict with bug 12833
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 8e91a0f01df4a37b36dc3fe27bab3126a0dc8aa8
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Aug 29 11:06:26 2014 +0200
Bug 12648: The users added to basket should have a permission
Before this enh, the users to add to a basket should have the
acquisition.order_manage permission.
This patch reintroduces this behavior.
The code in acqui/add_user_search.pl was never used. The filter should
be done in the members/search service.
But it is not possible easily to filter using a sql query, so the filter
is done after. This means that we cannot use the DT pagination
(otherwise the results will become inconsistent).
Test plan:
1/ On adding patrons to a basket, verify that the search patron results contain
patron with the acquisition.order_manage permission.
2/ Verify that all patrons are return on the 'normal' patron search and
when adding patrons to an order.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 753cbc4040344938ba937a9d24ce4b2869a9fecd
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Jul 24 13:49:49 2014 +0200
Bug 12648: Add unit tests for C4::Acquisition::*OrderUsers
Test plan:
Verify that unit tests pass with
prove t/db_dependent/Acquisition/OrderUsers.t
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 519c27364334a1b62dd9acd4a36fbd40b7492475
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Jul 24 13:43:05 2014 +0200
Bug 12648: Link patrons to an order
This patch is the main patch.
This feature adds the ability to link patrons to an order.
On that way, they will be notified when the order is completely
received.
Test plan:
1/ Execute the updatedb entry and verify you have a new notification template in your table (tools/letter.pl).
code: ACQ_NOTIF_ON_RECEIV, module: acquisition
2/ You can edit it if you want
3/ Create a basket and create an order with 1 or more items
4/ Link 1+ patrons to this order
5/ Close the basket and receive the order
6/ When you have received all items for this order, all patrons attached
will be notified. Check the message_queue table to check if the letters
have correctly been added to the queue.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit bb1beb4f5d45fd288ad1ed8cb893b4bd2a01c1db
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Jul 24 13:33:06 2014 +0200
Bug 12648: Refactoring to prepare user search for reuse
A previous enhancement allows to link basket with patrons.
Next patches will use the same way to link order with patrons.
In order to avoir c/p of code, this patch refactores this part of code.
Test plan:
1/ Verify there is no regression on adding/modifying users to a basket.
(acqui/basket.pl?basketno=XXX, "Managed by", "Add user").
2/ Note that you get a friendly message if the user is already present in the
list and when the user has correctly been added to the list.
3/ Note that the list uses the member search service (ie. DataTable +
serverside processing).
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 1072b9267641ab3e51ab5b63319d1d0a2033cae7
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Jul 24 13:26:29 2014 +0200
Bug 12648: Link patrons to an order - DB changes
This patch inserts the new notification template into the letters table.
It also add the insert statements into the language specific files.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Amended patch: Add the kohastructure.sql changes
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 107 ++++++++++++++
C4/Utils/DataTables/Members.pm | 7 +-
Koha/Schema/Result/Aqorder.pm | 29 +++-
.../Result/{Aqbasketuser.pm => AqorderUser.pm} | 40 +++---
Koha/Schema/Result/Borrower.pm | 29 +++-
acqui/add_user_search.pl | 56 ++++++++
acqui/addorder.pl | 8 +-
acqui/aqbasketuser_search.pl | 77 ----------
acqui/basket.pl | 6 +-
acqui/neworderempty.pl | 9 ++
.../data/mysql/de-DE/mandatory/sample_notices.sql | 3 +
.../data/mysql/en/mandatory/sample_notices.sql | 3 +
.../data/mysql/es-ES/mandatory/sample_notices.sql | 4 +
.../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 3 +
installer/data/mysql/it-IT/necessari/notices.sql | 3 +
installer/data/mysql/kohastructure.sql | 12 ++
.../mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 3 +
.../data/mysql/pl-PL/mandatory/sample_notices.sql | 3 +
.../data/mysql/ru-RU/mandatory/sample_notices.sql | 3 +
.../data/mysql/uk-UA/mandatory/sample_notices.sql | 3 +
installer/data/mysql/updatedatabase.pl | 20 +++
.../prog/en/includes/patron-title.inc | 8 +-
koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 2 +-
.../prog/en/modules/acqui/add_user_search.tt | 152 ++++++++++++++++++++
.../prog/en/modules/acqui/aqbasketuser_search.tt | 79 ----------
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 32 ++---
.../prog/en/modules/acqui/neworderempty.tt | 57 ++++++++
.../en/modules/acqui/tables/members_results.tt | 21 +++
.../prog/en/modules/admin/aqbudgetperiods.tt | 27 +---
.../prog/en/modules/labels/label-edit-layout.tt | 24 +++-
.../prog/en/modules/members/moremember.tt | 2 +-
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 5 +
kohaversion.pl | 2 +-
svc/members/search | 33 ++++-
t/db_dependent/Acquisition/OrderUsers.t | 110 ++++++++++++++
tools/letter.pl | 3 +
36 files changed, 748 insertions(+), 237 deletions(-)
copy Koha/Schema/Result/{Aqbasketuser.pm => AqorderUser.pm} (67%)
create mode 100755 acqui/add_user_search.pl
delete mode 100755 acqui/aqbasketuser_search.pl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/add_user_search.tt
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/aqbasketuser_search.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt
create mode 100644 t/db_dependent/Acquisition/OrderUsers.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list