[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.07-79-g81ccdf6
Git repo owner
gitmaster at git.koha-community.org
Tue May 16 08:10:11 CEST 2017
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, 16.11.x has been updated
via 81ccdf686944747dca34d24e49f3505e5fcc17c7 (commit)
via f56d5b01a37f3ef5db091f6ed6ef88ffd9ca6628 (commit)
via 40f87f840011004c7f92f3b8b11a44978670dbcd (commit)
via 1ed833639207bd3d737143aed10c31eea486d3cd (commit)
via 716ef54b698f90be87d8ec5884375a20a23d4434 (commit)
via c54a51ca4c0d5aac420053c6d351f24ff65dd017 (commit)
via e3312b83ccd883629474a60259e40a8aaa01ceaf (commit)
via 84f795ab634b539dbb611ecbf4b711304e21b600 (commit)
via e9c262ceb2bb25d14029a1c25e2d891219dd7c21 (commit)
via 2516012d2688037e2d122001f78b105e102d4000 (commit)
via c15cf2a47cc753c526abfa54b6e9ace439f71d63 (commit)
via d8bec113340ddf9f8ea2a9081c595b1d7e7e0fea (commit)
via 31fcb1552e1846df470eb9ed9bf7016f6151d178 (commit)
via a42c3782c6d66ea78e90e67baedd12dccb2a5597 (commit)
via 399a7c52107f52ccaf4e3534b13bc2e886346273 (commit)
from 3922dc3a341358aed1dd05f178850c12e7ab280d (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 81ccdf686944747dca34d24e49f3505e5fcc17c7
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Apr 21 10:10:37 2017 -0400
Bug 18471 - Receiving order with unitprice greater than 1000 processing incorrectly
Receiving orders process the comma as a decimal point
Invoices are displaying incorrectly when formatting total
Test Plan:
1. Open a basket
2. Place an order for an item with price > 1000, $4367.00 for example
3. Close basket
4. Receive order
5. Note on orderreceive.pl the price is populate as "4,367.00"
6. Receive/Save
7. Note the 'Actual Cost' is now $4.00, verify db contains 4 as well
8. Cancel receipt
9. Receive again, this time enter price as "4367"
10. Receive/save
11. Note actual cost is correct
12. Finish receiving
13. Note invoice reads total as $4.00
14. Check db. price in aqorders is correct but displaying incorrectly
15. Apply this patch
16. Repeat step2 1. 14, note errors are fixed
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit f56d5b01a37f3ef5db091f6ed6ef88ffd9ca6628
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Apr 27 11:37:27 2017 -0300
Bug 18502: Make koha-shell set the right PERL5LIB on dev installs
Bug 16749 introduced a nice way to have flexible paths. During the discussion on how to do it, we moved from having it contain the path to the git dir to just a boolean. The 'koha-shell' script didn't get attention it seems, and it is broken on dev installs.
This was hidden by the fact that many of us run dev installs on kohadevbox, which sets a .bashrc file for de instance's user, containing the right path when opening the new shell.
This patch changes the logic so on a dev install, intranetdir is picked as the right path. This is how it is handled in koha-functions.sh
To test:
- On kohadevbox, run:
$ sudo koha-shell kohadev -c "perl misc4dev/populate_db.pl"
=> FAIL: C4/Installer.pm not found on PERL5LIB error.
- Apply this patch
- Replace /usr/bin/koha-shell with debian/scripts/koha-shell
$ sudo cp kohaclone/debian/scripts/koha-shell /usr/bin/koha-shell
- Run:
$ sudo koha-shell kohadev -c "perl misc4dev/populate_db.pl"
=> SUCCESS: No warning about missing libs is raised.
- Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 40f87f840011004c7f92f3b8b11a44978670dbcd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 16 14:07:05 2017 +0000
Bug 16749: Add is_instance check to koha-upgrade-schema
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 1ed833639207bd3d737143aed10c31eea486d3cd
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Feb 16 14:33:57 2017 +0100
Bug 16749: Check instancename in adjust_paths_dev_install
Check if the instance does not exist (or was not even passed).
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 716ef54b698f90be87d8ec5884375a20a23d4434
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 16 12:57:17 2017 +0000
Bug 16749: Use is_instance to make sure the dev instance exist
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c54a51ca4c0d5aac420053c6d351f24ff65dd017
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Feb 13 08:56:17 2017 +0100
Bug 16749: Go with a boolean flag, we love booleans
As requested by Jonathan on comment 10 on Bugzilla and supported by Tomas,
we should use the dev_install entry in koha-conf as a boolean flag.
Since we already used it as a path, this patch is not too strict about it.
If the entry is not empty and not equal to "0", we will interpret it as
a true value. The path is taken from the intranetdir entry.
Test plan:
[1] Copy debian/scripts/koha-functions.sh to /usr/share/koha/bin
[2] For a dev install:
Remove the dev install line, or toggle its value between empty string,
0 or 1 and each time test stop/start koha-indexer.
Check the path to rebuild_zebra with ps aux|grep indexer.
If you have no entry, an empty entry or a zero, you should see a regular
path.
(Note: You can do something similar with koha-start-sip.)
[3] For a regular install:
Remove the dev install line.
Stop/start koha-indexer or koha-plack, and verify that it still works.
Add a dev_install line with 0, and repeat stop/start.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Tested in a package installation of master+16749
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit e3312b83ccd883629474a60259e40a8aaa01ceaf
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Sep 12 11:51:22 2016 +0200
Bug 16749: Update debian docs for koha-translate
This patch adds the -d option to the documentation (with thanks to
Magnus Enger).
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Tested in a package installation of master+16749
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 84f795ab634b539dbb611ecbf4b711304e21b600
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 16 10:38:54 2016 +0200
Bug 16749: Adjustments for koha-translate
[AMENDED February 10, 2017]
[1] Added reading /etc/default/koha-common as in the other debian scripts.
We need it for KOHA_HOME.
[2] Add a -d|--dev parameter for dev installs.
[3] No hardcoded PERL5LIB or KOHA_INSTALL_DIR (KOHA_HOME).
They are read from default file or set by adjust_paths_dev_install.
[4] Adjust template paths for dev installs: OPAC_TMPL, INTRANET_TMPL.
[5] Remove references to obsolete themes ccsr and prog.
Test plan:
[1] Regular package install:
Copy koha-translate to /usr/sbin.
Run koha-translate -l to show installed languages.
Run koha-translate -l -a to show available languages.
Add a language: koha-translate -i nl-NL.
Check template folders in regular location (/usr/share/koha/...)
Remove a language: koha-translate -r nl-NL. Check again.
[2] Dev install or kohadevbox:
Copy koha-translate to /usr/sbin.
If needed, add the <dev_install> line to koha-conf.xml.
Run koha-translate -l -d yourinstance to show installed languages.
(Note: You only see the languages installed in this instance.)
Add a language: koha-translate -i nl-NL -d yourinstance.
Check template folders in the clone.
Remove a language: koha-translate -r nl-NL -d yourinstance.
Note: Make sure you have sufficient file permissions for the kohaclone
files and koha-conf.xml. On kohadevbox you might need to run sudo
koha-translate within the the vagrant user context.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested on Jessie (Debian VM and Kohadevbox)
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Tested in a package installation of master+16749
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit e9c262ceb2bb25d14029a1c25e2d891219dd7c21
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Feb 10 10:33:57 2017 +0100
Bug 16749: Adjustments for koha-plack
[1] Use run_safe_xmlstarlet for plack workers and requests
[2] Simplify adjust_paths. The lazy export statement is actually enough to
replace adjust_paths by one direct call to adjust_paths_dev_install.
Test plan:
[1] Copy koha-functions.sh and koha-plack:
cp [YOUR_PATH]/debian/scripts/koha-functions.sh /usr/share/koha/bin/
cp [YOUR_PATH]/debian/scripts/koha-plack /usr/sbin/
where YOUR_PATH might well be /home/vagrant/kohaclone.
[2] Make sure that you have dev_install in koha-conf.
Stop and start koha-plack. Verify with ps aux|grep plack.
[3] Rename dev_install to nodev_install (in start and end tag).
Now stop/start koha-plack. Verify with ps aux|grep plack.
[4] Change plack_requests to 51 in your koha-conf.
Restart Plack and check that you see 51 in ps aux|grep plack.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested on Jessie (Debian VM and Kohadevbox)
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Tested in a package installation of master+16749
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 2516012d2688037e2d122001f78b105e102d4000
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Feb 10 09:37:13 2017 +0100
Bug 16749: Adjust xmlstarlet calls in koha-functions
In various scripts we use xmlstarlet to extract values from koha-conf.
If we call xmlstarlet on non-existing entries in koha-conf, this may
however result in silently failing scripts (when set -e is in effect).
A function run_safe_xmlstarlet is added for situations where the entry
might not exist. It will not halt execution.
This patch only adjusts koha-functions.sh and modifies the xmlstarlet calls
for dev_install and zebra_loglevels.
Note: The function does not need to check file existence. If the file does
not exist, xmlstarlet warns about it; the function returns empty string,
but does not set an error exit status.
Test plan: See second patch ("koha-plack adjustments").
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Tested in a package installation of master+16749
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c15cf2a47cc753c526abfa54b6e9ace439f71d63
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Sep 12 12:22:05 2016 +0200
Bug 16733: [Follow-up] Add $home to api path too
In the meantime api was enabled in plack.psgi and needs a little tweak
too for a dev install.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit d8bec113340ddf9f8ea2a9081c595b1d7e7e0fea
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jun 15 14:08:28 2016 +0200
Bug 16733: Adjust other debian scripts using PERL5LIB
This patch makes the following changes:
koha-foreach, koha-upgrade-schema (shell scripts):
[1] Read default file
[2] Include helper functions
[3] Add call to adjust_paths_dev_install
[4] Replace hardcoded path by $PERL5LIB
koha-shell (perl script):
[1] Remove hardcoded lib path
[2] Add a sub that reads PERL5LIB from default or koha-conf, just as the
shell scripts do.
koha-plack (shell script), plack.psgi:
[1] Add call to adjust_paths_dev_install
[2] Remove hardcoded lib path
[3] Add installer path to PERL5LIB, remove it from plack.pgsi
koha-sitemap (shell script):
[1] Add call to adjust_paths_dev_install
[2] Remove hardcoded lib path
[3] Add installer path to PERL5LIB
[4] Adjust path for call to sitemap cron job
koha-start-sip (shell script):
[1] Read default file
[2] Include helper functions
[3] Add call to adjust_paths_dev_install
[4] Adjust path to C4/SIP
koha-stop-sip (shell script):
[1] Remove KOHA_CONF and PERL5LIB (not needed to stop the daemon)
[2] Same for paths in daemon client options
NOTE: Script debian/scripts/koha-upgrade-to-3.4 has been left out
intentionally.
Test plan:
[1] Regular install:
Run koha-foreach echo Hi
Run koha-upgrade-schema yourinstance
Run koha-shell yourinstance
If you have plack, run koha-plack --start|--stop yourinstance
Run koha-sitemap --generate yourinstance
Run koha-start-sip yourinstance
Run koha-stop-sip yourinstance
[2] Dev install [yourinstance] with <dev_install> in koha-conf.xml:
Run koha-upgrade-schema yourinstance
Run koha-shell yourinstance
If you have plack: koha-plack --start|--stop yourinstance
Run koha-sitemap --generate yourinstance
Run koha-start-sip yourinstance
Run koha-stop-sip yourinstance
[3] Git grep on koha/lib
You should no longer see occurrences in debian/scripts except:
koha-translate: see report 16749
koha-upgrade-to-3.4: left out intentionally
[4] Git grep on koha/bin
You should only see hits for lines with koha-functions in the
debian scripts except:
koha-upgrade-to-3.4: left out intentionally
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Most scripts tested on Wheezy (although it would not matter much).
Plack script tested on Jessie.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 31fcb1552e1846df470eb9ed9bf7016f6151d178
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jun 15 13:57:12 2016 +0200
Bug 16733: Adjust koha-rebuild-zebra
[1] Add a call to the new adjust_paths_dev_install
[2] Differentiate location of rebuild_zebra.pl
[3] Replace a hardcoded path by $PERL5LIB
Test plan:
Adjust a biblio record in package or dev install.
Run koha-rebuild-zebra -b -z for same instance.
Verify that the change has been indexed.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit a42c3782c6d66ea78e90e67baedd12dccb2a5597
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jun 15 13:43:41 2016 +0200
Bug 16733: Adjust koha-indexer
[1] Add a call to the new adjust_paths_dev_install
[2] Differentiate location of rebuild_zebra.pl
NOTE: The scripts assume koha-functions.sh to be in /usr/share/koha/bin.
Finding a better location for this shell library may be hard.
Test plan:
Run koha-indexer for a regular package install or a dev install.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 399a7c52107f52ccaf4e3534b13bc2e886346273
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Jun 14 16:00:58 2016 +0200
Bug 16733: Add adjust_paths_dev_install to koha-functions.sh
This new function checks koha-conf.xml for a given instance and if it
contains a dev_install line, it adjusts PERL5LIB and KOHA_HOME
accordingly. Otherwise it does not touch the values of these
variables as normally read from /etc/default/koha-common.
The function will be used in various debian scripts to allow for more
flexibility with dev installs. And at the same time aiming to make better
use of PERL5LIB and KOHA_HOME.
Test plan:
[1] Add <dev_install>/not/there</dev_install> to your koha-conf.xml.
[2] Run on the command line:
PERL5LIB=test
source [path-to-your-instance]/debian/scripts/koha-functions.sh
echo $PERL5LIB
adjust_paths_dev_install [name-of-your-instance]
echo $PERL5LIB
The last echo should be: /not/there
[3] Remove the <dev_install> line and repeat step 2.
The last echo should be: test
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
Summary of changes:
acqui/finishreceive.pl | 3 ++
acqui/invoice.pl | 4 +-
debian/docs/koha-translate.xml | 6 +++
debian/scripts/koha-foreach | 17 +++++++-
debian/scripts/koha-functions.sh | 37 ++++++++++++++++-
debian/scripts/koha-indexer | 14 ++++---
debian/scripts/koha-plack | 9 ++--
debian/scripts/koha-rebuild-zebra | 13 +++++-
debian/scripts/koha-shell | 22 +++++++++-
debian/scripts/koha-sitemap | 12 +++++-
debian/scripts/koha-start-sip | 23 ++++++++++-
debian/scripts/koha-stop-sip | 9 +---
debian/scripts/koha-translate | 79 +++++++++++++++++++++++++++---------
debian/scripts/koha-upgrade-schema | 33 +++++++++++----
debian/templates/plack.psgi | 10 ++---
15 files changed, 226 insertions(+), 65 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list