[koha-commits] main Koha release repository branch master updated. v3.14.00-alpha1-69-geb0e1e6

Tue Oct 22 15:36:35 CEST 2013

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  eb0e1e6bba31a2e741ed9b074ba7e1c9dd0c6083 (commit)
       via  904f9b06e05448c341fb407ecaac8ef237578242 (commit)
       via  f1bec6bf162284776e7cd41514546cda83fd399c (commit)
       via  00fb4ee905abfd23d621173c0a363ad4036c2a5d (commit)
       via  489d4800429354856e94349249c6507b04ab7908 (commit)
       via  10548eba61d6a998fd940447688ac589dfbf20f9 (commit)
       via  1afd7fe27094c963a279dde949cc81bea75e169e (commit)
       via  2fb3193dc794b40d1313b46fb1ce23953b0ba99c (commit)
       via  11165a05afa11eef6c76ef7a9af7795495a47be8 (commit)
       via  c25090b5f548b66c0fb88c510d8c0ad8c32b334a (commit)
       via  895e19919f689bd00ac24a14c6cd764239cb892f (commit)
       via  8a2b3bc0c89e265cd48c5482523ddeb36543d3d5 (commit)
      from  d910cee85c30cd3981662fd8ae6483d3e4749e0e (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 eb0e1e6bba31a2e741ed9b074ba7e1c9dd0c6083
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Oct 22 13:49:32 2013 +0000

    Bug 5336: (follow-up) improve setting 'partial' order status during upgrade

    This patch modifies the logic to set the partial status for an
    order to verify that:

    - at least one item has been received already
    - the order belongs to a closed basket

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 904f9b06e05448c341fb407ecaac8ef237578242
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Oct 22 13:42:23 2013 +0000

    Bug 5336: (follow-up) remove unused new parameter to NewOrder() that slipped in

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit f1bec6bf162284776e7cd41514546cda83fd399c
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Oct 22 13:38:18 2013 +0000

    Bug 5336: (follow-up) update DBIC schema class for aqorders

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 00fb4ee905abfd23d621173c0a363ad4036c2a5d
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Oct 22 13:18:14 2013 +0000

    Bug 5336: DBRev 3.13.00.032

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 489d4800429354856e94349249c6507b04ab7908
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Oct 2 09:58:14 2013 +0200

    Bug 5336: (follow-up) multiple QA fixes

    - add a message if the search returns no result
    - keep selected values if the search returns no result (for fund and
      order status)
    - remove plurals in order status
    - move the order status column in the search results table

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script.
    New tests also pass:
        t/db_dependent/Acquisition/close_reopen_basket.t

    1) Database update - I end up with too many partials. My test cases:

     - New orders, basket still open
       OK Expected: new, Result: partial
     - Ordered orders, basket and basketgroup closed
       OK Expected: ordered, Result: partial
     - Partially received orders
       OK Expected: partial/complete, Result: partial/complete
     - Received orders
       OK: Expected: complete, Result: complete
     - Cancelled orders
       * cancelled from open basket before order
       OK: Expected: cancelled, Result: cancelled
       * cancelled from closed basket before receive
       OK: Expected: cancelled, Result: cancelled

    All aqorders where updated with the correct status.

    I have saved my 'pre-updatedatabase' and can repeat the test anytime you have a follow up.

    2) Testing search functionality

      a) Order search - result list
      Order search shows a new column, I think it would be a bit better if the
      status there was singular instead of plural - new order, partially received
      order etc. - maybe we could even leave out the 'order'? (minor)

      The column seems a bit lost in the middle, not sure where it would make more
      sense (just saying)

      b) Order search - advanced search form
      The advanced search form now shows a new filter: Order status

      All new status can be searched.
      - an "empty" search will find all but cancelled orders
      - searching for cancelled orders works correctly and shows results
      Search works correctly, no regressions found.

      If no result is found a message is shown.
      All search input is kept, so you can modify your search terms easily.

    3) Testing setting of status after applying the patch

       a) Create a new order with 2 items - status is new. OK
       b) Close the basket - status is ordered. OK
       c) Receive both items - status is completed. OK
       d) Undo receipt - status is ordered. OK
       e) Receive only 1 item - order is split up into 2 orders:
           - status is partial OK
           - status is completed OK
       f) Undo receipt of received item - order is combined into 1 again
           - status is ordered OK!
       g) Receive only 1 item again - status ordered/partial.
       h) Delete order.
           - status is completed
           - status is cancelled
          OK!

       i) Undo receipt of 1 item again.
          Refresh page.

    This results in the following behaviour, that has been reported as
    bug 10984. After refreshing the page follow message is shown:
      Cannot cancel receipt. Possible reasons :
        - The order line you trying to cancel was created from a partial
        receipt of another order line which is already received.
        Try to cancel this one first and retry.
        - The order line you trying to cancel was created from a partial
        receipt of another order line which has been deleted.
        Cancellation is not possible.
      BUT: The receipt is undone, but you are left with a
        line with 2 items, a cancellation date and the status ordered.
        Because of the cancellation date the order is not visible in pending orders.

    The status is correct - so I feel this should not stop this patch.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 10548eba61d6a998fd940447688ac589dfbf20f9
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Oct 1 14:06:11 2013 +0200

    Bug 5336: (follow-up) fix case where partial status was not correctly set

    An order (o1) is considered as partially received if (at least) another
    order (o2) has the o1.ordernumber == o2.parent_ordernumber and the
    quantity received is < to the quantity (to receive) and o1.ordernumber
    != o1.parent_ordernumber.

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 1afd7fe27094c963a279dde949cc81bea75e169e
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Jul 11 10:43:05 2013 +0200

    Bug 5336: (follow-up) use understandable codes rather than magic numbers for orderstatus

    This patch uses understandable codes instead of magical numbers for the
    aqorders.orderstatus field.

    + execute sql queries in unit tests into a transaction.

    Signed-off-by: Pierre Angot <tredok.pierre at gmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 2fb3193dc794b40d1313b46fb1ce23953b0ba99c
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Jul 1 16:27:32 2013 +0200

    Bug 5336: (follow-up) miscellaneous changes

    - fix capitalization
    - fix update database message

    Signed-off-by: Pierre Angot <tredok.pierre at gmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 11165a05afa11eef6c76ef7a9af7795495a47be8
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Apr 23 16:50:22 2013 +0200

    Bug 5336: (follow-up) add unit tests for 3 acq routines

    Unit tests In C4::Acquisition for:
    - CloseBasket
    - ReopenBasket
    - GetBiblioCountByBasketno

    Signed-off-by: Cedric Vita <cedric.vita at dracenie.com>
    Signed-off-by: Pierre Angot <tredok.pierre at gmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit c25090b5f548b66c0fb88c510d8c0ad8c32b334a
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu May 2 10:38:27 2013 +0200

    Bug 5336: (follow-up) merge parent ordernumber and ordernumber columns in display

    Signed-off-by: Cedric Vita <cedric.vita at dracenie.com>
    Signed-off-by: Pierre Angot <tredok.pierre at gmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 895e19919f689bd00ac24a14c6cd764239cb892f
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Apr 23 15:30:11 2013 +0200

    Bug 5336: (follow-up) don't display deleted orders in late orders search result

    Test plan:
    Check that deleted orders are not listed in the late orders search
    results.

    Signed-off-by: Cedric Vita <cedric.vita at dracenie.com>

    Signed-off-by: Pierre Angot <tredok.pierre at gmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 8a2b3bc0c89e265cd48c5482523ddeb36543d3d5
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Jan 18 16:05:40 2012 +0100

    Bug 5336: Order search (search and UI enhancements)

    You can now search orders by

    - order status
    - fund

    The patch series also adds a new field, aqorders.orderstatus, which can
    contain following values:

      new
      ordered
      partial (for partially received orders)
      complete
      cancelled

    To test: Search and check if results are consistent in histsearch.pl
    Signed-off-by: Cedric Vita <cedric.vita at dracenie.com>

    Signed-off-by: Pierre Angot <tredok.pierre at gmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Comments on last patch.
    Note: status are no longer numeric, but strings now.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 C4/Acquisition.pm                                  |  147 ++++++++++++++++----
 Koha/Schema/Result/Aqorder.pm                      |   18 ++-
 acqui/basket.pl                                    |   18 ++-
 acqui/histsearch.pl                                |   25 +++-
 installer/data/mysql/kohastructure.sql             |    1 +
 installer/data/mysql/updatedatabase.pl             |   24 ++++
 .../prog/en/modules/acqui/histsearch.tt            |  140 ++++++++++++++-----
 kohaversion.pl                                     |    2 +-
 t/db_dependent/Acquisition/OrderFromSubscription.t |    2 +-
 t/db_dependent/Acquisition/close_reopen_basket.t   |   80 +++++++++++
 10 files changed, 386 insertions(+), 71 deletions(-)
 create mode 100644 t/db_dependent/Acquisition/close_reopen_basket.t

hooks/post-receive
-- 
main Koha release repository