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

[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  88b46f342209b4f08748fd0e03f5a03d8708306e (commit)
      from  481c062fe9ee72ffc204b6ccb37a4bfe0c23cadf (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 88b46f342209b4f08748fd0e03f5a03d8708306e
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Wed Jun 19 15:19:06 2013 -0400

    Bug 10401: Add ability to merge invoices
    
    Given how easy it is to accidentally receive items from one invoice on
    multiple invoices, the ability to merge invoices can be quite handy.
    This patch adds that ability to Koha's Acquisitions module.
    
    To test:
    1) Apply patch.
    2) Run unit test:
        > prove t/db_dependent/Acquisition/Invoices.t
    3) Create two invoices from the same vendor for merging, and receive at
       least one order on each.
    4) Do a search on the Invoices page that brings up both the invoices you
       created.
    5) Check the boxes next to the two invoices.
    6) Click "Merge selected invoices."
    7) Choose which invoice you want to keep (the default will be the first).
    8) Click "Merge."
    9) Confirm that the resulting invoice has all the orders you received
       listed on it.
    10) Sign off.
    
    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script.
    Merged several invoices sucessfully - with and without received
    orders, open and closed. Works nicely.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 C4/Acquisition.pm                                  |   26 ++++
 acqui/invoice.pl                                   |    3 +
 acqui/invoices.pl                                  |    9 ++
 .../intranet-tmpl/prog/en/css/staff-global.css     |   26 +++-
 .../prog/en/modules/acqui/invoices.tt              |   93 +++++++++++-
 t/db_dependent/Acquisition/Invoices.t              |  156 ++++++++++++++++++++
 6 files changed, 307 insertions(+), 6 deletions(-)
 create mode 100644 t/db_dependent/Acquisition/Invoices.t


hooks/post-receive
-- 
main Koha release repository