[koha-commits] updated branch master (9c286deb271676964366e0175e884e09ed068b10)

[Koha Gitosis]

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 "Koha GitWeb".

The branch, master has been updated
       via  9c286deb271676964366e0175e884e09ed068b10 (commit)
       via  94769fc83160d2dafecef478c67a579e1a52361f (commit)
       via  fc2120c6df76341f5b5889717554462fd4ac4e06 (commit)
       via  e244e094c63bfa8692af64b2db6edfa65640c12b (commit)
      from  2da4f3021489cd14620500ff9f8986b61eeb3e79 (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 9c286deb271676964366e0175e884e09ed068b10
Author: Nicole Engard <nengard at gmail.com>
Date:   Sat Feb 6 06:48:58 2010 -0500

    bug 4168 add keyword to marc mapping to menu
    
    Also fixed misnamed budgets & funds links
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit 94769fc83160d2dafecef478c67a579e1a52361f
Author: Nicole Engard <nengard at gmail.com>
Date:   Sat Feb 6 06:58:45 2010 -0500

    add koha to marc mapping help file
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit fc2120c6df76341f5b5889717554462fd4ac4e06
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Thu Feb 11 19:38:34 2010 +0000

    Bug 4163 Preserve budget value unless changed by user
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit e244e094c63bfa8692af64b2db6edfa65640c12b
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Thu Feb 11 14:40:44 2010 +0000

    bugfix suppress warnings coming from acquisitions homepage
    
    Before formatting and doing arithmetic with them we should
    ensure undefined numeric elements are numbers
    (This should be enforced in the db)
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

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

Summary of changes:
 acqui/acqui-home.pl                                |   10 ++++++
 acqui/neworderempty.pl                             |   30 ++++++++-----------
 .../intranet-tmpl/prog/en/includes/admin-menu.inc  |    6 ++-
 .../prog/en/modules/acqui/neworderempty.tmpl       |    8 ++++-
 .../prog/en/modules/help/admin/fieldmapping.tmpl   |   19 ++++++++++++
 5 files changed, 53 insertions(+), 20 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tmpl


hooks/post-receive
-- 
Koha GitWeb