[koha-commits] main Koha release repository branch master updated. v3.22.00-1412-g3615c7b

Git repo owner gitmaster at git.koha-community.org
Fri Apr 29 15:05:38 CEST 2016


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  3615c7b34bc77f04e1421cab8dca8e094e10f0ed (commit)
       via  26297903e4cb4663320aac8aee49fca87d92f4a8 (commit)
       via  97d988b54fa4574faa93edf40940f5e700b5fe2f (commit)
       via  9501ac2feffa8aca965fd24156560870df4065c3 (commit)
      from  764fa320de24f3099712ad5cc5cf451ffb966e34 (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 3615c7b34bc77f04e1421cab8dca8e094e10f0ed
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Apr 29 13:14:50 2016 +0000

    Bug 15531 - DBRev 3.23.00.057
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 26297903e4cb4663320aac8aee49fca87d92f4a8
Author: Jesse Weaver <jweaver at bywatersolutions.com>
Date:   Mon Jan 11 16:07:33 2016 -0700

    Bug 15531: (QA followup) Fix several small issues
    
      * Add `AFTER` to DB update
      * Change "Is standing order basket:" to "Orders are standing:"
      * Disable item creation when adding from a staged file
      * Correctly show is_standing for existing baskets
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 97d988b54fa4574faa93edf40940f5e700b5fe2f
Author: Jesse Weaver <jweaver at bywatersolutions.com>
Date:   Mon Jan 11 16:07:33 2016 -0700

    Bug 15531: (followup) Use a quantity of 1, not null, for standing orders
    
    This seems to cause fewer problems with the existing acquisitions code.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 9501ac2feffa8aca965fd24156560870df4065c3
Author: Jesse Weaver <jweaver at bywatersolutions.com>
Date:   Mon Jan 11 16:07:33 2016 -0700

    Bug 15531: Add support for standing orders
    
    This allows creation of special baskets that include standing orders.
    These orders do not have a known quantity (and may not have a known
    price in advance). Upon receipt, the received items are split into a new
    completed order.
    
    Test plan:
      1) Run updatedatabase.pl.
      2) Run prove t/db_dependent/Acquisition/StandingOrders.t . (and the
         other Acquisition tests).
      3) Create a new basket, mark it as a standing order basket.
      4) Add an order to this basket, and notice that the quantity field is
         missing (and thus not required).
      5) Receive items for this order, and notice that the original order is
         unchanged. The new child order line should have the correct price
         and quantity information.
    
    (Note: the QA tools output what seems to be a spurious spelling error
    for Test::More's "isnt" in StandingOrders.t.)
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

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

Summary of changes:
 C4/Acquisition.pm                                  |   40 ++++---
 Koha.pm                                            |    2 +-
 Koha/Acquisition/Order.pm                          |    5 +-
 Koha/Schema/Result/Aqbasket.pm                     |   14 ++-
 acqui/addorder.pl                                  |    6 +-
 acqui/addorderiso2709.pl                           |    6 +-
 acqui/basket.pl                                    |   16 ++-
 acqui/basketheader.pl                              |    3 +
 acqui/neworderempty.pl                             |    1 +
 installer/data/mysql/kohastructure.sql             |    1 +
 installer/data/mysql/updatedatabase.pl             |   10 ++
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |    3 +
 .../prog/en/modules/acqui/basketheader.tt          |    9 ++
 .../prog/en/modules/acqui/neworderempty.tt         |    8 +-
 t/db_dependent/Acquisition/StandingOrders.t        |  122 ++++++++++++++++++++
 15 files changed, 215 insertions(+), 31 deletions(-)
 create mode 100644 t/db_dependent/Acquisition/StandingOrders.t


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list