[koha-commits] main Koha release repository branch master updated. v3.18.00-211-g7a4cdb8

[Git repo owner]

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  7a4cdb823ff28e159d6d3564533c74e70377d725 (commit)
       via  eed14b080db8691f371b4c19f1a190b87fcc396a (commit)
       via  229cb65629c93d30191bc6c797d06021942239b2 (commit)
      from  580ed6360ddf0eac902fe807bc76abddec86529a (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 7a4cdb823ff28e159d6d3564533c74e70377d725
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Nov 19 13:40:10 2014 +0100

    Bug 13001: The total for received order should be based on the unitprice
    
    For already received orders, the total should be calculated with the
    unitprice, not the estimated cost.
    
    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit eed14b080db8691f371b4c19f1a190b87fcc396a
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Sep 26 14:46:21 2014 +0200

    Bug 13001: Refactor VAT and price calculation - parcel page
    
    Bug 12969 introduces a subroutine to centralize VAT and prices
    calculation.
    It should be use in the acqui/parcel.pl script.
    
    Test plan:
    1/ Create 4 suppliers with the different configurations
    2/ Create a basket and create several orders
    3/ Go on the parcel page
    4/ You should see, on the "pending orders" table, the same prices as
    before this patch.
    Note that the prices are now correctly formated.
    
    You could see one change for the supplier configuration 3 (1 0):
    If the cost of the item is 82, discount 10% and vat 5%:
    The "Order cost" = 140.58 instead of 140.57.
    Indeed, before this patch, the order cost was wrong, now you should have
    70.29*2 = 140.58
    
    ( before: 140.58 + 7.03 = 147.61
      now:    140.58 + 7.02 = 147.60 )
    
    5/ Receive the items and return on the parcel page
    Now the "Already received" table with the same prices as before this
    patch.
    Note some differences too:
    - There was a td tag missing, the table was badly formated, it's now
    fixed (column below the "Cancel receipt" link).
    - The prices are now correctly formated.
    - For the configuration 2 (1 1), if the cost of the item is 82, discount
      10% and vat 5%:
    
    ( before: 140.57 + 7.03 = 147.60
      now:    140.58 + 7.02 = 147.60 )
    
    Note that 7.03 is the "correct" value, but on all other pages, 7.02 is
    displayed.
    To be consistent, we should display the same prices everywhere.
    
    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 229cb65629c93d30191bc6c797d06021942239b2
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Jan 7 08:26:57 2015 -0500

    Bug 13525 - Date sorting on accounts (fines) tab doesn't work correctly
    
    Date sorting of charges under Patron -> Fines -> Account is done based
    on formatted dates, so sorting is broken depending on your dateformat
    system preference. This patch implements the standard "title-string"
    date sorting method.
    
    To test, apply the patch and view the Account tab. Test sorting of
    charges under various settings of the dateformat system preference. Date
    sorting should work correctly in all cases.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as described and fixes sorting problem.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 acqui/parcel.pl                                    |  106 ++++++--------------
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |   23 +++--
 .../prog/en/modules/members/boraccount.tt          |   10 +-
 members/boraccount.pl                              |    2 -
 4 files changed, 48 insertions(+), 93 deletions(-)


hooks/post-receive
-- 
main Koha release repository