[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.04-55-g77b5850

Git repo owner gitmaster at git.koha-community.org
Tue Mar 17 09:02:23 CET 2015


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, 3.18.x has been updated
       via  77b5850b3cffb21fe1bb336ec714b8ae0baec683 (commit)
       via  46b13460f94e3603e2268566df6f4bcaa66cf7ca (commit)
       via  9e82e5accee1f790b6add500b86c9f40044f77b0 (commit)
       via  8ecb0ef544216a712715ea4e4166e30b204ee5fe (commit)
       via  7a17ca5833d07ecf10f705bc90f7a127c7bda4b6 (commit)
      from  adedefb512909a4760cd49d53cdaca648e6f2aa1 (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 77b5850b3cffb21fe1bb336ec714b8ae0baec683
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Tue Mar 17 21:01:27 2015 +1300

    Bumping version number

commit 46b13460f94e3603e2268566df6f4bcaa66cf7ca
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Feb 10 09:43:25 2015 +0100

    Bug 13380: Wording changes
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit cd5752f37239729aa71e687fa9be3be491defd23)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 9e82e5accee1f790b6add500b86c9f40044f77b0
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Feb 10 09:47:18 2015 +0100

    Bug 13380: Add ORDER_CANCELLATION_REASON AV to all language files
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 7c224d1cb05099749d4046a4dad75ae49ff186cc)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 8ecb0ef544216a712715ea4e4166e30b204ee5fe
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Dec 3 13:07:16 2014 +0100

    Bug 13380: Fill order cancellation reasons from AV
    
    Since bug 7162, it's possible to give a cancellation reason on deleting
    an order.
    This would be better to fill an authorised values category with the
    different possible values.
    Like that we will avoid to have duplicate or similar reasons.
    
    Also, it will be easier to filter or create reports.
    
    Test plan:
    0/ Don't apply the patch
    1/ Cancel some orders and give a cancelletion reason
    2/ Apply the patch and execute the updatedb entry
    3/ Cancel an order and verify the you have a list with the reason you
    previously filled + 3 new ones ('No reason', 'Sold out' and
    'Restocking');
    4/ Choose one and verify the value is correctly displayed on the basket
    page
    5/ You can also try to add other values from the admin module.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit b475728a50477aaff34ff16ed9194b39c46d66ea)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Conflicts:
    	installer/data/mysql/updatedatabase.pl
    	koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt

commit 7a17ca5833d07ecf10f705bc90f7a127c7bda4b6
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Dec 3 13:24:16 2014 +0100

    Bug 13380: Add the AV in the install files
    
    (This will completely done when the patch will be QAed)
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 2c7457a0d4f6f00204dbbb6c50db5e684816a7c6)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 installer/data/mysql/de-DE/optional/auth_val.sql   |    5 +++
 installer/data/mysql/en/optional/auth_val.sql      |    5 +++
 installer/data/mysql/es-ES/optional/auth_val.sql   |    5 +++
 .../fr-FR/1-Obligatoire/authorised_values.sql      |    5 +++
 installer/data/mysql/it-IT/necessari/auth_val.sql  |    5 +++
 .../data/mysql/nb-NO/2-Valgfritt/auth_val.sql      |    5 +++
 installer/data/mysql/pl-PL/optional/auth_val.sql   |    5 +++
 installer/data/mysql/updatedatabase.pl             |   35 ++++++++++++++++++++
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |    4 ++-
 .../prog/en/modules/acqui/cancelorder.tt           |    2 +-
 kohaversion.pl                                     |    2 +-
 11 files changed, 75 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list