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

(-)a/C4/Branch.pm (-4 / +6 lines)
Lines 203-209 sub ModBranch { Link Here
203
        my $query  = "
203
        my $query  = "
204
            INSERT INTO branches
204
            INSERT INTO branches
205
            (branchcode,branchname,branchaddress1,
205
            (branchcode,branchname,branchaddress1,
206
            branchaddress2,branchaddress3,branchzip,branchcity,
206
            branchaddress2,branchaddress3,branchzip,branchcity,branchstate,
207
            branchcountry,branchphone,branchfax,branchemail,
207
            branchcountry,branchphone,branchfax,branchemail,
208
            branchurl,branchip,branchprinter,branchnotes)
208
            branchurl,branchip,branchprinter,branchnotes)
209
            VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
209
            VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
Lines 213-219 sub ModBranch { Link Here
213
            $data->{'branchcode'},       $data->{'branchname'},
213
            $data->{'branchcode'},       $data->{'branchname'},
214
            $data->{'branchaddress1'},   $data->{'branchaddress2'},
214
            $data->{'branchaddress1'},   $data->{'branchaddress2'},
215
            $data->{'branchaddress3'},   $data->{'branchzip'},
215
            $data->{'branchaddress3'},   $data->{'branchzip'},
216
            $data->{'branchcity'},       $data->{'branchcountry'},
216
            $data->{'branchcity'},       $data->{'branchstate'},
217
            $data->{'branchcountry'},
217
            $data->{'branchphone'},      $data->{'branchfax'},
218
            $data->{'branchphone'},      $data->{'branchfax'},
218
            $data->{'branchemail'},      $data->{'branchurl'},
219
            $data->{'branchemail'},      $data->{'branchurl'},
219
            $data->{'branchip'},         $data->{'branchprinter'},
220
            $data->{'branchip'},         $data->{'branchprinter'},
Lines 225-231 sub ModBranch { Link Here
225
            UPDATE branches
226
            UPDATE branches
226
            SET branchname=?,branchaddress1=?,
227
            SET branchname=?,branchaddress1=?,
227
                branchaddress2=?,branchaddress3=?,branchzip=?,
228
                branchaddress2=?,branchaddress3=?,branchzip=?,
228
                branchcity=?,branchcountry=?,branchphone=?,
229
                branchcity=?,branchstate=?,branchcountry=?,branchphone=?,
229
                branchfax=?,branchemail=?,branchurl=?,branchip=?,
230
                branchfax=?,branchemail=?,branchurl=?,branchip=?,
230
                branchprinter=?,branchnotes=?
231
                branchprinter=?,branchnotes=?
231
            WHERE branchcode=?
232
            WHERE branchcode=?
Lines 235-241 sub ModBranch { Link Here
235
            $data->{'branchname'},
236
            $data->{'branchname'},
236
            $data->{'branchaddress1'},   $data->{'branchaddress2'},
237
            $data->{'branchaddress1'},   $data->{'branchaddress2'},
237
            $data->{'branchaddress3'},   $data->{'branchzip'},
238
            $data->{'branchaddress3'},   $data->{'branchzip'},
238
            $data->{'branchcity'},       $data->{'branchcountry'},
239
            $data->{'branchcity'},       $data->{'branchstate'},       
240
            $data->{'branchcountry'},
239
            $data->{'branchphone'},      $data->{'branchfax'},
241
            $data->{'branchphone'},      $data->{'branchfax'},
240
            $data->{'branchemail'},      $data->{'branchurl'},
242
            $data->{'branchemail'},      $data->{'branchurl'},
241
            $data->{'branchip'},         $data->{'branchprinter'},
243
            $data->{'branchip'},         $data->{'branchprinter'},
(-)a/admin/branches.pl (-1 / +2 lines)
Lines 343-349 sub branchinfotable { Link Here
343
        for my $field (
343
        for my $field (
344
            'branchaddress1', 'branchaddress2',
344
            'branchaddress1', 'branchaddress2',
345
            'branchaddress3', 'branchzip',
345
            'branchaddress3', 'branchzip',
346
            'branchcity', 'branchcountry',
346
            'branchcity', 'branchstate', 'branchcountry',
347
            'branchphone', 'branchfax',
347
            'branchphone', 'branchfax',
348
            'branchemail', 'branchurl',
348
            'branchemail', 'branchurl',
349
            'branchip',       'branchprinter', 'branchnotes'
349
            'branchip',       'branchprinter', 'branchnotes'
Lines 402-407 sub _branch_to_template { Link Here
402
         branchaddress3 => $data->{'branchaddress3'},
402
         branchaddress3 => $data->{'branchaddress3'},
403
         branchzip      => $data->{'branchzip'},
403
         branchzip      => $data->{'branchzip'},
404
         branchcity     => $data->{'branchcity'},
404
         branchcity     => $data->{'branchcity'},
405
         branchstate    => $data->{'branchstate'},
405
         branchcountry  => $data->{'branchcountry'},
406
         branchcountry  => $data->{'branchcountry'},
406
         branchphone    => $data->{'branchphone'},
407
         branchphone    => $data->{'branchphone'},
407
         branchfax      => $data->{'branchfax'},
408
         branchfax      => $data->{'branchfax'},
(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
Lines 342-347 CREATE TABLE `branches` ( Link Here
342
  `branchaddress3` mediumtext,
342
  `branchaddress3` mediumtext,
343
  `branchzip` varchar(25) default NULL,
343
  `branchzip` varchar(25) default NULL,
344
  `branchcity` mediumtext,
344
  `branchcity` mediumtext,
345
  `branchstate` mediumtext,
345
  `branchcountry` text,
346
  `branchcountry` text,
346
  `branchphone` mediumtext,
347
  `branchphone` mediumtext,
347
  `branchfax` mediumtext,
348
  `branchfax` mediumtext,
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 3987-3992 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
3987
    SetVersion ($DBversion);
3987
    SetVersion ($DBversion);
3988
}
3988
}
3989
3989
3990
$DBversion = '3.0X.XX.XXX';
3991
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
3992
    $dbh->do("ALTER TABLE branches ADD `branchstate` mediumtext AFTER `branchcity`;");
3993
    print "Upgrade to $DBversion done (Add state to branch address)\n";
3994
    SetVersion ($DBversion);
3995
}
3996
3990
=head1 FUNCTIONS
3997
=head1 FUNCTIONS
3991
3998
3992
=head2 DropAllForeignKeys($table)
3999
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl (-2 / +4 lines)
Lines 109-115 Link Here
109
        <li><label for="branchaddress1">Address Line 1</label><input type="text" name="branchaddress1" id="branchaddress1" value="<!-- TMPL_VAR name="branchaddress1" escape="HTML" -->" /></li>
109
        <li><label for="branchaddress1">Address Line 1</label><input type="text" name="branchaddress1" id="branchaddress1" value="<!-- TMPL_VAR name="branchaddress1" escape="HTML" -->" /></li>
110
        <li><label for="branchaddress2">Address Line 2</label><input type="text" name="branchaddress2" id="branchaddress2" value="<!-- TMPL_VAR name="branchaddress2" escape="HTML" -->" /></li>
110
        <li><label for="branchaddress2">Address Line 2</label><input type="text" name="branchaddress2" id="branchaddress2" value="<!-- TMPL_VAR name="branchaddress2" escape="HTML" -->" /></li>
111
        <li><label for="branchaddress3">Address Line 3</label><input type="text" name="branchaddress3" id="branchaddress3" value="<!-- TMPL_VAR name="branchaddress3" escape="HTML" -->" /></li>
111
        <li><label for="branchaddress3">Address Line 3</label><input type="text" name="branchaddress3" id="branchaddress3" value="<!-- TMPL_VAR name="branchaddress3" escape="HTML" -->" /></li>
112
        <li><label for="branchcity">City, State</label><input type="text" name="branchcity" id="branchcity" value="<!-- TMPL_VAR name="branchcity" escape="HTML" -->" /></li>
112
        <li><label for="branchcity">City</label><input type="text" name="branchcity" id="branchcity" value="<!-- TMPL_VAR name="branchcity" escape="HTML" -->" /></li>
113
        <li><label for="branchstate">State</label><input type="text" name="branchstate" id="branchstate" value="<!-- TMPL_VAR name="branchstate" escape="HTML" -->" /></li>
113
        <li><label for="branchzip">Zip/Postal Code</label><input type="text" name="branchzip" id="branchzip" value="<!-- TMPL_VAR name="branchzip" escape="HTML" -->" /></li>
114
        <li><label for="branchzip">Zip/Postal Code</label><input type="text" name="branchzip" id="branchzip" value="<!-- TMPL_VAR name="branchzip" escape="HTML" -->" /></li>
114
        <li><label for="branchcountry">Country</label><input type="text" name="branchcountry" id="branchcountry" value="<!-- TMPL_VAR name="branchcountry" escape="HTML" -->" /></li>
115
        <li><label for="branchcountry">Country</label><input type="text" name="branchcountry" id="branchcountry" value="<!-- TMPL_VAR name="branchcountry" escape="HTML" -->" /></li>
115
        <li><label for="branchphone">Phone</label><input type="text" name="branchphone" id="branchphone" value="<!-- TMPL_VAR name="branchphone" escape="HTML" -->" /></li>
116
        <li><label for="branchphone">Phone</label><input type="text" name="branchphone" id="branchphone" value="<!-- TMPL_VAR name="branchphone" escape="HTML" -->" /></li>
Lines 211-217 Link Here
211
                        <!-- TMPL_IF name="branchzip" -->
212
                        <!-- TMPL_IF name="branchzip" -->
212
                            <br /><!-- TMPL_VAR name="branchzip" escape="HTML" --><!-- /TMPL_IF -->
213
                            <br /><!-- TMPL_VAR name="branchzip" escape="HTML" --><!-- /TMPL_IF -->
213
                        <!-- TMPL_IF name="branchcity" -->
214
                        <!-- TMPL_IF name="branchcity" -->
214
                            <br /><!-- TMPL_VAR name="branchcity" escape="HTML" --><!-- /TMPL_IF -->
215
                            <br /><!-- TMPL_VAR name="branchcity" escape="HTML" --><!-- /TMPL_IF --><!-- TMPL_IF name="branchstate" -->, 
216
                            <!-- TMPL_VAR name="branchstate" escape="HTML" --><!-- /TMPL_IF -->
215
                        <!-- TMPL_IF name="branchcountry" -->
217
                        <!-- TMPL_IF name="branchcountry" -->
216
                            <br /><!-- TMPL_VAR name="branchcountry" escape="HTML" --><!-- /TMPL_IF -->
218
                            <br /><!-- TMPL_VAR name="branchcountry" escape="HTML" --><!-- /TMPL_IF -->
217
                        <!-- TMPL_IF name="branchphone" -->
219
                        <!-- TMPL_IF name="branchphone" -->
(-)a/kohaversion.pl (-2 / +1 lines)
Lines 16-22 the kohaversion is divided in 4 parts : Link Here
16
use strict;
16
use strict;
17
17
18
sub kohaversion {
18
sub kohaversion {
19
    our $VERSION = '3.03.00.017';
19
    our $VERSION = '3.0X.XX.XXX';
20
    # version needs to be set this way
20
    # version needs to be set this way
21
    # so that it can be picked up by Makefile.PL
21
    # so that it can be picked up by Makefile.PL
22
    # during install
22
    # during install
23
- 

Return to bug 5431