[koha-commits] main Koha release repository branch master updated. v3.14.00-1078-gf13c72e
Git repo owner
gitmaster at git.koha-community.org
Sun May 4 23:58:42 CEST 2014
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 f13c72ebee0d6312512b88cd1c61e24b4e181902 (commit)
via 11b9bd0f4a62ec690abd675cfabeef7705605439 (commit)
via 95e14edc1c8815e9a46eec3c9355420eb3203603 (commit)
via 8d5c38fd4760f804515b13b7f79b9a5dbfff988b (commit)
via 94d3aed746b8f925dd8832b104137741415b886c (commit)
from bbd3db8c84af321485d93352ee6ccb83a96b61be (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 f13c72ebee0d6312512b88cd1c61e24b4e181902
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sun May 4 22:21:17 2014 +0000
Bug 9593: (follow-up) don't make currency.isocode required
This patch changes the price parsing so that it can fall
back on the currency name if an ISO code is not supplied; this allows
for handling the very common situation where the currency name
as entered was already the same as the ISO code.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 11b9bd0f4a62ec690abd675cfabeef7705605439
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sun May 4 22:05:31 2014 +0000
Bug 9593: update DBIC files
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 95e14edc1c8815e9a46eec3c9355420eb3203603
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sun May 4 22:04:14 2014 +0000
Bug 9593: DBRev 3.15.00.044
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 8d5c38fd4760f804515b13b7f79b9a5dbfff988b
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Apr 22 07:13:19 2014 -0400
Bug 9593: (QA Followup)
- use "ISO" instead of "iso"
- move hint text
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 94d3aed746b8f925dd8832b104137741415b886c
Author: Lyon3 Team <koha at univ-lyon3.fr>
Date: Tue Apr 15 12:13:05 2014 +0200
Bug 9593: improve parsing of prices from staged files
Initial bug :
When there's a round price with no decimals after it,
or when the symbol is after the digits, the price is not captured
by regular expression in MungeMarcPrice routine and the variable
is not initialized.
Enhancement :
The MungeMarcPrice routine had been widely modified.
It's still possible to priority pick the active currency but
unlike the previous mechanism that worked only for prices preceded
by the currency sign, it's now valid wherever the symbol is situated.
As symbol you may enter a pure currency sign as well as a string
including it like '$US'. Moreover, an 'isocode' column had been
added in currency table (editable in the staffo interface from
Administration/Currencies and exchange rates). So the active
currency can be picked either through its symbol or through its iso
code.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests, especially t/db_dependent/MungeMarcPrice.t
Checked currencies can be added, edited and deleted.
Notes: new ISO code field is mandatory.
Sample sql files need to be updated (bug 12146)
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 76 ++++++++++++--------
Koha/Schema/Result/Currency.pm | 12 +++-
admin/currency.pl | 7 +-
installer/data/mysql/kohastructure.sql | 1 +
installer/data/mysql/updatedatabase.pl | 7 ++
.../prog/en/modules/admin/currency.tt | 18 ++++-
kohaversion.pl | 2 +-
t/db_dependent/MungeMarcPrice.t | 74 +++++++++++++++++++
8 files changed, 160 insertions(+), 37 deletions(-)
create mode 100755 t/db_dependent/MungeMarcPrice.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list