[koha-commits] main Koha release repository branch master updated. v3.14.00-alpha2-107-geaf4730

[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  eaf4730abe6002e52192076376a15729447f2939 (commit)
       via  8c60cd41a84453f4edd7a8e8752860066fac6d32 (commit)
       via  4b3b87a7c3db584e1a4cad11b9b3a7a656f8a0ae (commit)
       via  380bfcedd529f5d5b52c11bd8b6d5f32dd3c10dd (commit)
       via  4f775cd640e35b8fb5c5b1af295e82086a4a7692 (commit)
       via  dd22c0ec0f06f0b47301ba8fa58385ffc2c1e8a1 (commit)
       via  3910d5e8b4f982b53f7aebd484a8d12fb42b1a52 (commit)
      from  0f6882896d6a806fb474b1fd172e3e93919d960c (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 eaf4730abe6002e52192076376a15729447f2939
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Oct 21 23:49:01 2013 +0000

    Bug 8037: (follow-up) fix undefined variable warning during template processing
    
    Fix instances of the following warning appearing in the Apache log:
    
    ... parcel.pl: Argument "" isn't numeric in addition (+)
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 8c60cd41a84453f4edd7a8e8752860066fac6d32
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Oct 21 23:34:46 2013 +0000

    Bug 8037: (follow-up) improve GetBudgetByOrderNumber test
    
    This patch moves the GetBudgetByOrderNumber() test from
    Budgets.t to Acquisition.t, thereby making it easier to
    test without doing a direct SQL insert into the aqorders table.
    
    To test:
    
    [1] Verify that prove -v t/db_dependent/Budgets.t passes
    [2] Verify that prove -v t/db_dependent/Acquisition.t passes
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 4b3b87a7c3db584e1a4cad11b9b3a7a656f8a0ae
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Oct 21 23:20:39 2013 +0000

    Bug 8037: (follow-up) tweak fund subtotal note
    
    Use "Tax exc." rather than "GST exc." to be consistent with other parts
    of the table footer.  Also remove the new style introduced in the previous
    patch; defining non-semantic CSS classes like font-weight-normal is not
    desirable.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 380bfcedd529f5d5b52c11bd8b6d5f32dd3c10dd
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Oct 25 14:27:10 2013 +0200

    Bug 8037: (follow-up) bad sql query and variable renaming
    
    The first patch does a left join on aqorders_items which returns too
    much order lines.
    
    This patch follows the Galen's suggestion: it removes the join and calls
    the GetItemnumbersFromOrder routine for retrieving itemnumbers.
    
    Bonus: the "parcelitems" variable is badly named and obfuscates the code.
    I changed it for "orders".
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 4f775cd640e35b8fb5c5b1af295e82086a4a7692
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed May 8 09:06:17 2013 -0400

    Bug 8037: (follow-up) adds the note "GST exc." for subtotals by fund
    
    Signed-off-by: Pierre Angot <tredok.pierre at gmail.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit dd22c0ec0f06f0b47301ba8fa58385ffc2c1e8a1
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Mar 22 03:35:41 2013 -0700

    Bug 8037: (follow-up) fix various issues
    
    [1] Add test for GetBudgetByOrderNumber()
    [2] Remove unconditional warn.
    [3] Remove MySQLism
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 3910d5e8b4f982b53f7aebd484a8d12fb42b1a52
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Mar 28 13:33:36 2012 -0400

    Bug 8037: Display holds & fund on the already received table on order receipt summary
    
    Adds a column to indicate holds on received items, as well as adding
    a new column for fund and showing the subtotals per fund above
    the total subtotal.
    
    To test:
    
    [1] Create an order basket containing at least one title and
        ensure that an item is created for that title.  Close the
        basket.
    [2] Place a hold on the title.
    [3] Receive the order.  After receiving it, but before finishing
        the invoice, the table of already received orders should now
        have columns for the order budget and number of holds on the
        title as well as lines with the subtotal per fund.
    
    Signed-off-by: Pierre Angot <tredok.pierre at gmail.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 C4/Acquisition.pm                                  |    7 +--
 C4/Budgets.pm                                      |   25 ++++++++
 C4/Reserves.pm                                     |   11 +++-
 acqui/parcel.pl                                    |   31 ++++++----
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |   62 ++++++++++++++++----
 t/db_dependent/Acquisition.t                       |    4 +-
 6 files changed, 110 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
main Koha release repository