View | Details | Raw Unified | Return to bug 9530
Collapse All | Expand All

(-)a/C4/Branch.pm (-3 / +7 lines)
Lines 202-209 sub ModBranch { Link Here
202
            (branchcode,branchname,branchaddress1,
202
            (branchcode,branchname,branchaddress1,
203
            branchaddress2,branchaddress3,branchzip,branchcity,branchstate,
203
            branchaddress2,branchaddress3,branchzip,branchcity,branchstate,
204
            branchcountry,branchphone,branchfax,branchemail,
204
            branchcountry,branchphone,branchfax,branchemail,
205
            branchurl,branchip,branchprinter,branchnotes,opac_info)
205
            branchurl,branchip,branchprinter,branchnotes,opac_info,
206
            VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
206
            branchreplyto, branchreturnpath)
207
            VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
207
        ";
208
        ";
208
        my $sth    = $dbh->prepare($query);
209
        my $sth    = $dbh->prepare($query);
209
        $sth->execute(
210
        $sth->execute(
Lines 216-221 sub ModBranch { Link Here
216
            $data->{'branchemail'},      $data->{'branchurl'},
217
            $data->{'branchemail'},      $data->{'branchurl'},
217
            $data->{'branchip'},         $data->{'branchprinter'},
218
            $data->{'branchip'},         $data->{'branchprinter'},
218
            $data->{'branchnotes'},      $data->{opac_info},
219
            $data->{'branchnotes'},      $data->{opac_info},
220
            $data->{'branchreplyto'},    $data->{'branchreturnpath'}
219
        );
221
        );
220
        return 1 if $dbh->err;
222
        return 1 if $dbh->err;
221
    } else {
223
    } else {
Lines 225-231 sub ModBranch { Link Here
225
                branchaddress2=?,branchaddress3=?,branchzip=?,
227
                branchaddress2=?,branchaddress3=?,branchzip=?,
226
                branchcity=?,branchstate=?,branchcountry=?,branchphone=?,
228
                branchcity=?,branchstate=?,branchcountry=?,branchphone=?,
227
                branchfax=?,branchemail=?,branchurl=?,branchip=?,
229
                branchfax=?,branchemail=?,branchurl=?,branchip=?,
228
                branchprinter=?,branchnotes=?,opac_info=?
230
                branchprinter=?,branchnotes=?,opac_info=?,
231
                branchreplyto=?, branchreturnpath=?
229
            WHERE branchcode=?
232
            WHERE branchcode=?
230
        ";
233
        ";
231
        my $sth    = $dbh->prepare($query);
234
        my $sth    = $dbh->prepare($query);
Lines 239-244 sub ModBranch { Link Here
239
            $data->{'branchemail'},      $data->{'branchurl'},
242
            $data->{'branchemail'},      $data->{'branchurl'},
240
            $data->{'branchip'},         $data->{'branchprinter'},
243
            $data->{'branchip'},         $data->{'branchprinter'},
241
            $data->{'branchnotes'},      $data->{opac_info},
244
            $data->{'branchnotes'},      $data->{opac_info},
245
            $data->{'branchreplyto'},    $data->{'branchreturnpath'},
242
            $data->{'branchcode'},
246
            $data->{'branchcode'},
243
        );
247
        );
244
    }
248
    }
(-)a/admin/branches.pl (+2 lines)
Lines 402-407 sub _branch_to_template { Link Here
402
         branchphone    => $data->{'branchphone'},
402
         branchphone    => $data->{'branchphone'},
403
         branchfax      => $data->{'branchfax'},
403
         branchfax      => $data->{'branchfax'},
404
         branchemail    => $data->{'branchemail'},
404
         branchemail    => $data->{'branchemail'},
405
         branchreplyto  => $data->{'branchreplyto'},
406
         branchreturnpath => $data->{'branchreturnpath'},
405
         branchurl      => $data->{'branchurl'},
407
         branchurl      => $data->{'branchurl'},
406
         opac_info      => $data->{'opac_info'},
408
         opac_info      => $data->{'opac_info'},
407
         branchip       => $data->{'branchip'},
409
         branchip       => $data->{'branchip'},
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt (-2 / +1 lines)
Lines 126-132 tinyMCE.init({ Link Here
126
        <li><label for="branchphone">Phone: </label><input type="text" name="branchphone" id="branchphone" size="60" value="[% branchphone |html %]" /></li>
126
        <li><label for="branchphone">Phone: </label><input type="text" name="branchphone" id="branchphone" size="60" value="[% branchphone |html %]" /></li>
127
        <li><label for="branchfax">Fax: </label><input type="text" name="branchfax" id="branchfax" size="60" value="[% branchfax |html %]" /></li>
127
        <li><label for="branchfax">Fax: </label><input type="text" name="branchfax" id="branchfax" size="60" value="[% branchfax |html %]" /></li>
128
        <li><label for="branchemail">Email: </label><input type="text" name="branchemail" id="branchemail" class="email"  size="80" value="[% branchemail |html %]" /></li>
128
        <li><label for="branchemail">Email: </label><input type="text" name="branchemail" id="branchemail" class="email"  size="80" value="[% branchemail |html %]" /></li>
129
        <li><label for="branchreply">Reply-To (if different to Email): </label> <input type="text" name="branchreplyto" id="branchreplyto" class="email"  size="80" value="[% branchreplyto |html %]" /></li>
129
        <li><label for="branchreplyto">Reply-To (if different to Email): </label> <input type="text" name="branchreplyto" id="branchreplyto" class="email"  size="80" value="[% branchreplyto |html %]" /></li>
130
        <li><label for="branchreturnpath">Return-Path (if different to Email): </label> <input type="text" name="branchreturnpath" id="branchreturnpath" class="email"  size="80" value="[% branchreturnpath |html %]" /></li>
130
        <li><label for="branchreturnpath">Return-Path (if different to Email): </label> <input type="text" name="branchreturnpath" id="branchreturnpath" class="email"  size="80" value="[% branchreturnpath |html %]" /></li>
131
        <li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl"  size="80" value="[% branchurl |html %]" class="url" /></li>
131
        <li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl"  size="80" value="[% branchurl |html %]" class="url" /></li>
132
        <li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% opac_info |html %]</textarea></li>
132
        <li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% opac_info |html %]</textarea></li>
133
- 

Return to bug 9530