From 7a3fd9c03083b2d42648355805fe8a8aa0d715bf Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Tue, 12 Aug 2014 09:57:06 +1200 Subject: [PATCH] Bug 9350: Making changes so that you can add the new fields to branches To test 1/ Apply patch 2/ Add or Edit a branch, filling out the new fields 3/ Check that the changes saved http://bugs.koha-community.org/show_bug.cgi?id=9530 --- C4/Branch.pm | 10 +++++++--- admin/branches.pl | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/C4/Branch.pm b/C4/Branch.pm index 83d2010..ff571dc 100644 --- a/C4/Branch.pm +++ b/C4/Branch.pm @@ -202,8 +202,9 @@ sub ModBranch { (branchcode,branchname,branchaddress1, branchaddress2,branchaddress3,branchzip,branchcity,branchstate, branchcountry,branchphone,branchfax,branchemail, - branchurl,branchip,branchprinter,branchnotes,opac_info) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + branchurl,branchip,branchprinter,branchnotes,opac_info, + branchreplyto, branchreturnpath) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) "; my $sth = $dbh->prepare($query); $sth->execute( @@ -216,6 +217,7 @@ sub ModBranch { $data->{'branchemail'}, $data->{'branchurl'}, $data->{'branchip'}, $data->{'branchprinter'}, $data->{'branchnotes'}, $data->{opac_info}, + $data->{'branchreplyto'}, $data->{'branchreturnpath'} ); return 1 if $dbh->err; } else { @@ -225,7 +227,8 @@ sub ModBranch { branchaddress2=?,branchaddress3=?,branchzip=?, branchcity=?,branchstate=?,branchcountry=?,branchphone=?, branchfax=?,branchemail=?,branchurl=?,branchip=?, - branchprinter=?,branchnotes=?,opac_info=? + branchprinter=?,branchnotes=?,opac_info=?, + branchreplyto=?, branchreturnpath=? WHERE branchcode=? "; my $sth = $dbh->prepare($query); @@ -239,6 +242,7 @@ sub ModBranch { $data->{'branchemail'}, $data->{'branchurl'}, $data->{'branchip'}, $data->{'branchprinter'}, $data->{'branchnotes'}, $data->{opac_info}, + $data->{'branchreplyto'}, $data->{'branchreturnpath'}, $data->{'branchcode'}, ); } diff --git a/admin/branches.pl b/admin/branches.pl index 7c4b539..2aa87df 100755 --- a/admin/branches.pl +++ b/admin/branches.pl @@ -402,6 +402,8 @@ sub _branch_to_template { branchphone => $data->{'branchphone'}, branchfax => $data->{'branchfax'}, branchemail => $data->{'branchemail'}, + branchreplyto => $data->{'branchreplyto'}, + branchreturnpath => $data->{'branchreturnpath'}, branchurl => $data->{'branchurl'}, opac_info => $data->{'opac_info'}, branchip => $data->{'branchip'}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index 361d4ab..2cb6237 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -126,7 +126,7 @@ tinyMCE.init({
  • -
  • +
  • -- 2.0.1