[koha-commits] main Koha release repository branch master updated. v16.05.00-1218-g2354e41
Git repo owner
gitmaster at git.koha-community.org
Fri Oct 28 13:56:39 CEST 2016
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 2354e41b6191d44be1d1e9e8830359335b3b87d6 (commit)
via cf9efd7312630ce318ab1457654a56ad06e8e931 (commit)
via 1aa88636a6af0d10ac1df01ca41ce3a6eb8bbc81 (commit)
via 28ef209c81c5ba21ffd7800e0b94ced051c8c8d2 (commit)
via f6bdc2f9378c0f2f932150f75c43fe28b96eb37e (commit)
via f8472e1686c9822768a38202f62eb98bfc11da31 (commit)
via 1e120924c2bfd11c4e0bf4a8479897d6cc2cf921 (commit)
via 0ca7ac9dd5726bf8f39d3e28eda9a466ac12ff4c (commit)
via fd97c08ee327d8a4d35a06708e16d1344af8af3a (commit)
via 0f72535232d9d5165c0e3dd9e158652cf3504be0 (commit)
via 9af64aa7d5739c0160fe484958921f1294955fb5 (commit)
from 0bc8f1fd462c4bf9fc37af883c9fb776ab9a0f85 (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 2354e41b6191d44be1d1e9e8830359335b3b87d6
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Oct 28 11:54:58 2016 +0000
Bug 5260 - DBRev 16.06.00.040
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit cf9efd7312630ce318ab1457654a56ad06e8e931
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 20 09:07:34 2016 +0100
Bug 5260: Use post params instead of get to avoid putting op=email in the browser history
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 1aa88636a6af0d10ac1df01ca41ce3a6eb8bbc81
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 20 08:58:05 2016 +0100
Bug 5260: simplify script and error handling
No need to redirect, just sent the params to the template directly
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 28ef209c81c5ba21ffd7800e0b94ced051c8c8d2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 20 08:54:50 2016 +0100
Bug 5260: Insert the new letter for existing installs
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit f6bdc2f9378c0f2f932150f75c43fe28b96eb37e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 20 08:54:21 2016 +0100
Bug 5260: make tests pass even without patron cat 'PT'
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit f8472e1686c9822768a38202f62eb98bfc11da31
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Wed Oct 19 23:52:21 2016 +0200
Bug 5260: QA follow-up - Add sample ACQORDER notice to sample notices
Adds the new notice ACQORDER to all web installers.
Verify by testing the SQL contains no errors and by running:
perl xt/sample_notices.t
NOTE:
- de-DE is already translated, others are in English.
- xt/sample_notices.t doesn't check fr-CA yet. I didn't fix this here
as the file is missing other notices as well which should be fixed
separately.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 1e120924c2bfd11c4e0bf4a8479897d6cc2cf921
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Wed Oct 19 23:26:22 2016 +0200
Bug 5260: QA follow-up: Fix error when no notice template is defined
When no notice template ACQORDER was defined, you'r receive a false
positive "email sent" message. Now it will display a specific
error message instead.
Also includes 2 unit tests to test for the warn and new error code.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 0ca7ac9dd5726bf8f39d3e28eda9a466ac12ff4c
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Oct 16 12:56:48 2016 +0200
Bug 5260: Follow-up - Reindenting POD of SendAlerts
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit fd97c08ee327d8a4d35a06708e16d1344af8af3a
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Oct 14 07:19:40 2016 +0000
Bug 5260 - Schema changes
Schema changes for new column in the aqcontacts table.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 0f72535232d9d5165c0e3dd9e158652cf3504be0
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Oct 14 12:02:33 2016 +0200
Bug 5260: Unit tests for new functionality in SendAlert
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 9af64aa7d5739c0160fe484958921f1294955fb5
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Tue Jun 16 00:44:44 2015 +0200
Bug 5260 - Add option to send an order by e-mail to the acquisition module
With this patch it will be possible to send order information
to the vendor by e-mail. For now this feature can be triggered
manually with a button before closing the basket.
The order e-mail is based on the acquisition claim feature, but
uses a new notice template.
Test plan:
1) Vendors
A new checkbox "Contact when ordering?" was added to the vendor
page.
- Add a vendor and/or edit an existing vendor
- Verify the new option is saved correctly
- Verify the new option displays on the vendor summary page
after saving
2) Notices
The feature works with a new notice template: ACQORDER
It works with the same formatting/fields etc. as the acq claim
notice.
- Add a new notice template ACQORDER in module
'Claim/order aquisition'
- Make sure to use fields from the various offered tables
in your notice
- Verify it is saved correctly
3) Basket
- Turn on LetterLog system preference
- Create multiple order lines
- Click the 'Send order' button in the toolbar
- Verify error or success message
- Verify you received the e-mail
- Verify there is a new entry with about the sent
notice in your action_logs table
4) Regression testing...
- Verify order claims still work
- Verify serial claims still work
- Verify new serial issue notices still work
...
(I can provide additional test plans if needed)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Bookseller/Contact.pm | 13 ++-
C4/Letters.pm | 107 +++++++++++++++-----
Koha.pm | 2 +-
Koha/Schema/Result/Aqcontact.pm | 12 ++-
acqui/basket.pl | 34 +++++--
acqui/lateorders.pl | 4 +-
acqui/updatesupplier.pl | 4 +-
.../data/mysql/de-DE/mandatory/sample_notices.sql | 1 +
.../data/mysql/en/mandatory/sample_notices.sql | 1 +
.../data/mysql/es-ES/mandatory/sample_notices.sql | 1 +
.../mysql/fr-CA/obligatoire/sample_notices.sql | 1 +
.../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 1 +
installer/data/mysql/it-IT/necessari/notices.sql | 1 +
installer/data/mysql/kohastructure.sql | 1 +
.../mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 1 +
.../data/mysql/pl-PL/mandatory/sample_notices.sql | 1 +
.../data/mysql/ru-RU/mandatory/sample_notices.sql | 1 +
.../data/mysql/uk-UA/mandatory/sample_notices.sql | 1 +
installer/data/mysql/updatedatabase.pl | 14 +++
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 28 ++++-
.../prog/en/modules/acqui/supplier.tt | 15 ++-
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 5 +
t/db_dependent/Letters.t | 28 ++++-
tools/letter.pl | 4 +-
24 files changed, 224 insertions(+), 57 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list