[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-185-g1644708

Wed Oct 25 11:09:19 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, 17.05.x has been updated
       via  1644708857ea3d3de6683bcf8e1300febc977384 (commit)
       via  388ced2e7472ccde5e8f3764d37d0d6c18480e34 (commit)
       via  19b3041fb8bee95c320a909afd45f57b707ff2c2 (commit)
       via  8250e0f69a069ae2a43f52135e0a6d4daf259dfc (commit)
       via  2df9a4c0e0793065ce6787d683a68bef72075ff6 (commit)
       via  be5ddee5889fd76e50bfbfd00deb173f7c07f83f (commit)
       via  d1475051bae13621bf2b56b68443e375bc2e1ea7 (commit)
      from  4d22af870d1051d963cab31169a7f536864e56b0 (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 1644708857ea3d3de6683bcf8e1300febc977384
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed Oct 25 11:03:00 2017 +0200

    Bug 18999: (17.05.x followup) Koha::Acquisition::Order is not an object yet

commit 388ced2e7472ccde5e8f3764d37d0d6c18480e34
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Fri Sep 29 11:29:24 2017 -0300

    Bug 18999: (QA followup) ModReceiveOrder expects a hashref

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 2b343df13e6d154296cf968cb709aa910c58f336)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 19b3041fb8bee95c320a909afd45f57b707ff2c2
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date:   Sat Jul 22 19:19:44 2017 +0000

    Bug 18999: Modified SQL query in GetBudgetSpent() in C4/Budgets.pm

    Removed the SQL select condition 'AND closedate IS NOT NULL' because
    this was not returning shippingcost values and it does not exist in the
    SQL query to return the shipping cost in spent.pl

    Also removed the retrieval of shipping cost and the associated addition
    of item(s) cost and shipping cost in GetBudgetOrdered() in C4/Budgets.pm
    to prevent the shipping costs being subtracted off the fund total twice

    Test plan:
    1. Go to Acquisition and create a currency, budget (make this value of
    100), fund ( make this the value of 50), vendor (if
    neccessary)

    2. Create a basket and click 'Add to basket'

    3. Add 2 items with the vendor price of 10

    4. Click 'Receive shipment' and write in the shipment cost of 6

    5. Click 'Finish receiving' and go back to Acquisitions

    6. Notice the spent column value is 0.00 but if you click on the value then
    the spent.pl page is displayed and shows that the shipment cost was 6.00

    7. On the acquisition page also notice that the ordered column value is 26.00

    8. Click on the name of the fund and notice the spent column value is
    0.00 in the fund page table

    9. Apply patch

    10. Refresh acquisition page and notice that 6.00 is the value in the
    Spent column and 20.00 is the value in the ordered column. Both of which
    match the subtotal of the full-list tables displayed when you click on these
    values

    11. Also notice the spent value in the fund page table is 6.00

    12 Observe the changes to GetBudgetSpent() and GetBudgetOrdered() C4/Budgets.pm and check they make sense

    Sponsored-by: Catalyst IT

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit caef98c7f64e02bba996c4da4f862bb55a86171a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 8250e0f69a069ae2a43f52135e0a6d4daf259dfc
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date:   Sat Sep 16 07:52:25 2017 +0000

    Bug 18999: (QA followup) Minor fixes for tests

    Removed unneccessary declaration of $budget and changed
    Koha::Acquisition::Order->new->insert into
    Koha::Acquisition::Order->new->store as requested in tester feedback

    Test plan:
    1. Go into your koha-shell

    2. set the PERL5LIB variable

    3. Run t/db_dependent/Budgets.t

    All tests should pass

    Sponsored-by: Catalyst IT

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 90c5391b349a339b3f1fea1ebfeb044cfa76c8a6)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 2df9a4c0e0793065ce6787d683a68bef72075ff6
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date:   Fri Aug 18 15:16:55 2017 +0000

    Bug 18999: Add regression tests

    Added regression test for GetBudgetSpent() and GetBudgetOrdered() into
    the t/db_dependent/Budgets.t

    Test plan:
    1. Go into your koha-shell

    2. set the PERL5LIB variable

    3. Run t/db_dependent/Budgets.t

    All tests should pass

    Sponsored-by: Catalyst IT

    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 776692f31167f32c1621168249a9ebfea2accc96)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit be5ddee5889fd76e50bfbfd00deb173f7c07f83f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Oct 13 09:16:29 2017 +0200

    Bug 19425: (QA follow-up) Resolve 'push on reference experimental' warn

    QA tools reported for acqui/addorderiso2709.pl
       FAIL   valid: push on reference is experimental

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit a16510a04af5c00b5857e7722cc8c69fb0d0b860)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit d1475051bae13621bf2b56b68443e375bc2e1ea7
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Oct 6 09:47:26 2017 -0400

    Bug 19425: Adding orders from order file with multiple budgets per record triggers error

    If you import an order file ( using MarcItemFieldsToOrder ) that has a different budget for each item to be ordered, you will get an error and a partially created basket. This is because Koha attempts to add the item to each order *for each budget*. This is clearly incorrect. Instead, we should be grouping items by budget and for each budget only adding those items that have a matching budget.

    Test plan:
    1) Do not apply this patch
    2) Download the provided MARC record
    3) Add the branchcode 'ALD' to your server
    4) Add the ccode 'ACOL' to your server
    5) Add the budget codes 'adultay' and 'branchay' to your server
    6) Stage the order file
    7) Create a basket, import the order file
    8) No we have 3 records, 2 of them have 2 items each with different budget codes
    9) Attempt to import, note the error
    10) Apply this patch
    11) Repeat steps 6-8, note the order completes and results in 5 order lines being added to the basket!

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Christopher Kellermeyer <ckellermeyer at altadenalibrary.org>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    First step of test plan amended (not apply instead of apply).

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0dc722c5183bdd162eba6992a4d38a1a9d28f285)

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

Summary of changes:
 C4/Budgets.pm            |   12 +------
 acqui/addorderiso2709.pl |    4 ++-
 t/db_dependent/Budgets.t |   83 +++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 86 insertions(+), 13 deletions(-)

hooks/post-receive
-- 
main Koha release repository