[koha-commits] main Koha release repository branch master updated. v3.22.00-831-gd25c7f9

[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  d25c7f9232c79cc1d52c76da6c17d23fb801fb87 (commit)
       via  34380f406c77e5f5fd65e311f09117113f053130 (commit)
      from  859e3ce41b69692471e9a1e37d646f9ed0bfe6dd (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 d25c7f9232c79cc1d52c76da6c17d23fb801fb87
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Mar 8 14:51:42 2016 +0100

     Bug 15084: [QA Follow-up] Update kohastructure
    
    Adds two db revs to kohastructure
    
    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>

commit 34380f406c77e5f5fd65e311f09117113f053130
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Mar 8 10:15:32 2016 +0000

     Bug 15084: typo currency vs currency_code
    
    The DB column is currency.currency not currency.currency_code.
    
    Test plan:
    Delete a currency
    Without this patch, you will get a warning in the logs:
    No method currency_code! at
    /home/koha/src/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
    line 148.
    And the currency won't be deleted.
    
    With this patch, it will!
    
    It also changes the value of the delete op.
    
    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>

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

Summary of changes:
 admin/currency.pl                                         |    2 +-
 installer/data/mysql/kohastructure.sql                    |    4 +++-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository