Koha-community/Koha - Koha - Koha: The world's first free and open source library system

Commit Graph

Author	SHA1	Message	Date
Nick Clemens	94a445d413	Bug 26239: Do not format large negative numbers At several places we got the following error if we use numbers too big for Number::Format Template process failed: undef error - round() overflow. Try smaller precision or use Math::BigFloat at /home/koha/src/Koha/Number/Price.pm line 44 It make the app explodes. The goal here is to handle these errors gracefully and easily. We fixed it for positive numbers in bug 15770, but we neglected the case of negative numbers Test plan: - Add a manual credit to a patron of 100000000000000 - ISE! - Apply patch - Restart all the things Works perfectly. Signed-off-by: Amit Gupta <amit.gupta@informaticsglobal.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	4 years ago
Nick Clemens	4ccbae8879	Bug 18736: (follow-up) Fix missing rounding and bad formatting This patch: Adds a missing use Uses 'Koha::Number::Price->round()' instead of 'format()' to ensure numeric returns Ensures too big numbers don't crash round() Uses syspref in 'GetBudgetHierarchy' To test: Follow previous test plan Check values on admin/aqbudgets.pl are affected by syspref Ensure values throughout acquisitions are correctly calculated/displayed (even when greater than 1,000) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Nick Clemens	7a84297ac4	Bug 21262: Do not format numbers for editing if too big This patch copies the code from bug 15770 to the format_for_editing sub. It also corrects schema issue, listing the purpose for two acq columns instead of claing unused To test: 1 - Edit a fund 2 - Set warning at amount to: 100000000000000 3 - Save budget 4 - Try to edit - internal server error 5 - Apply patch 6 - Should be able to edit budget 7 - Number should appear unformatted Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> 2 quick notes: 1. Code must be moved to a subroutine if reused later 2. It would have prefered to have the comment of the 2 DB columns on a separate patch (even separate bug report). As it's minor and that the patch will certainly backported I will not block it. Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Jonathan Druart	fc082c26a1	Bug 20625: Handle non existing of active currency This patch avoid the explosion in the air when creating a new patron category and no active currency is defined. Test plan: Remove the currencies, create a new patron category Without this patch applied you will get Can't call method "p_sep_by_space" on an undefined value With this patch the form will be displayed correctly and you will be able to create the patron category Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Jonathan Druart	18e72e3195	Bug 4078: Add the ability to display and configure the symbol for prices The symbol of currencies are not displayed (or not correctly) so far. This patch set adds the ability to configure the display of the symbol (with or without a whitespace between the symbol and the price). Test plan: 1. Execute the update DB entry, go to the currency admin page and tick the new "Space separation between symbol and value" checkbox 2. Add a fine to a patron and use their credentials to login at the OPAC 3. You should see the "$ 42 due fines and charges" info in the dashboard 4. Untick the new checkbox to remove the space and reload the OPAC main page. => The space should not be longer displayed ($42) Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Jonathan Druart	d2a045b9d5	Bug 15770: Do not format numbers if too big At several places we got the following error if we use numbers too big for Number::Format Template process failed: undef error - round() overflow. Try smaller precision or use Math::BigFloat at /home/koha/src/Koha/Number/Price.pm line 44 It make the app explodes. The goal here is to handle these errors gracefully and easily. Test plan: - Add a manual fine to a patron of 100000000000000 - Create a patron category with an enrolment fee of 123456789012345 Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Fridolin Somers	e35903574c	Bug 18900: wrong number format in receiving order Bug 18471 added number formating in order receive. I found a bug generated by this. Koha::Number::Price defines methods to (un)format price depending on CurrencyFormat syspref. The bug is that for CurrencyFormat US, some params are not defined in this module so there are retrieved from system locale. If system locale is not en_US, the params will be wrong. For example fr_FR will define ',' as decimal and so saved unit price is divided by 1000. To recreate: - On a server with locale 'fr_FR' - With Plack mode - Set CurrencyFormat on 'US' - Open a basket - Place an order for an item - Close basket - Receive order with changing 'Actual Cost' to '1,234' - Note the 'Actual Cost' is now '1.23' - Run unit test t/Number/Price.t without and with patch Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	7 years ago
Marc Véron	3586d1504b	Bug 16768 - Add official number format for Switzerland: 1'234'567.89 This patch adds the official number format for Switzerland (CH) and makes it selectable in syspref 'CurrencyFormat' To test: - Apply patch - Set syspref 'CurrencyFormat' to '360'000.00 (CH)' - Go to Home > Administration > Budgets administration - Create or edit a budget with Total amount of 1234567.89 - Verify that the amount appears properly formated as 1'234'567.89 Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Jonathan Druart	1538e9ecf4	Bug 15084: Replace C4::Budgets::GetCurrencies with Koha::Acquisition::Currencies->search Most part of the code here is unnecessary complex. We should selected the currency if it is selected, that's all :) Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>	9 years ago
Jonathan Druart	15468615f9	Bug 13836: Does not separate symbol and value if symbol is not displayed. This patch force the separation between the symbol and the value to an empty string if the symbol is not displayed. Tested with locale de_CH.UTF-8, prove t/Prices.t is now successful. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	9 years ago
Jonathan Druart	945a0f09e7	Bug 13352: On editing, prices should not be formatted Bug 12979 refactored the way to display prices. The price format configuration was duplicated everywhere it was used. All calls looks good except the one in admin/aqbudgetperiods.pl In this one, the prices are formatted for an edition field (input). This means the input is incorrectly filled even if the user does not update the field. At the end, maybe should we manage formatted prices everywhere, even in inputs, but it's not in the scope of this bug. Technically, a new subroutine format_for_editing is added to the Koha::Number::Price module. It should be called everywhere a price is displayed in an input field. At the moment, it only does a sprintf("%.2f"), but it is a first step to let the number of decimals to display configurable. To test: 1/ Verify the issue described is fixed (editing a budget with a total amount > 1000 (With CurrencyFormat is US or FR). 2/ Verify you can edit a fund with a total amount > 1000 Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	9 years ago
Jonathan Druart	a19958ee2c	Bug 12969: Add a subroutine to calculate VAT and prices This patch adds a new subroutine populate_order_with_prices in the C4::Acquisition module. Its goal is to refactore the VAT and prices calculation into Koha. All scripts will use this subroutine. Test plan: Verify that the prices in t/Prices.t are consistent with the values listed in the file "Prices and VAT calculation - before" submit on bug 12964. Verify that prove t/Prices.t returns green Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Jonathan Druart	ac4544ea47	Bug 12844: Force the symbol place in the tests Looking with Katrin at the default configuration of Number::Format, she has the p_cs_precedes value set to 0 (put the symbol at the end) and p_sep_by_sep set to 1. Now it is possible to sent these values to the format subroutine. On this way, the tests can force them in order to pass on all configuration. This default value for this variable certainly depends on the locales. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Jonathan Druart	e6d1d8727b	Bug 12844: New module to manage prices into Koha This patch introduces a new module to manage prices into Koha and especially the acquisition module. How to use is: 1/ You can use it in a perl script/module: my $price = Koha::Number::Price->new(3); $price->format; # Will display 3.00 (or 3,00 depending on the CurrencyFormat syspref). $price->format({with_symbol => 1}); # Will display €3.00 (or [$]3,00 depending on the CurrencyFormat syspref). 2/ But this module is usefull to display the price from a template file. [% my_price \| Price %] Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago

14 Commits (6f272a16b2eb6d200402489b26435eea282ec622)