projects
/
koha_fer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 3543: split NLM call numbers in label creator
[koha_fer]
/
C4
/
Branch.pm
diff --git
a/C4/Branch.pm
b/C4/Branch.pm
index
db7a87f
..
abcdbd6
100644
(file)
--- a/
C4/Branch.pm
+++ b/
C4/Branch.pm
@@
-160,7
+160,7
@@
sub GetBranchesLoop (;$$) { # since this is what most pages want anyway
my $onlymine = @_ ? shift : onlymine();
my $branches = GetBranches($onlymine);
my @loop;
my $onlymine = @_ ? shift : onlymine();
my $branches = GetBranches($onlymine);
my @loop;
- foreach (
sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches
) {
+ foreach (
sort { uc($branches->{$a}->{branchname}) cmp uc($branches->{$b}->{branchname}) } keys %$branches
) {
push @loop, {
value => $_,
selected => ($_ eq $branch) ? 1 : 0,
push @loop, {
value => $_,
selected => ($_ eq $branch) ? 1 : 0,
@@
-203,17
+203,18
@@
sub ModBranch {
my $query = "
INSERT INTO branches
(branchcode,branchname,branchaddress1,
my $query = "
INSERT INTO branches
(branchcode,branchname,branchaddress1,
- branchaddress2,branchaddress3,branchzip,branchcity,
+ branchaddress2,branchaddress3,branchzip,branchcity,
branchstate,
branchcountry,branchphone,branchfax,branchemail,
branchurl,branchip,branchprinter,branchnotes)
branchcountry,branchphone,branchfax,branchemail,
branchurl,branchip,branchprinter,branchnotes)
- VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+ VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?
,?
)
";
my $sth = $dbh->prepare($query);
$sth->execute(
$data->{'branchcode'}, $data->{'branchname'},
$data->{'branchaddress1'}, $data->{'branchaddress2'},
$data->{'branchaddress3'}, $data->{'branchzip'},
";
my $sth = $dbh->prepare($query);
$sth->execute(
$data->{'branchcode'}, $data->{'branchname'},
$data->{'branchaddress1'}, $data->{'branchaddress2'},
$data->{'branchaddress3'}, $data->{'branchzip'},
- $data->{'branchcity'}, $data->{'branchcountry'},
+ $data->{'branchcity'}, $data->{'branchstate'},
+ $data->{'branchcountry'},
$data->{'branchphone'}, $data->{'branchfax'},
$data->{'branchemail'}, $data->{'branchurl'},
$data->{'branchip'}, $data->{'branchprinter'},
$data->{'branchphone'}, $data->{'branchfax'},
$data->{'branchemail'}, $data->{'branchurl'},
$data->{'branchip'}, $data->{'branchprinter'},
@@
-225,7
+226,7
@@
sub ModBranch {
UPDATE branches
SET branchname=?,branchaddress1=?,
branchaddress2=?,branchaddress3=?,branchzip=?,
UPDATE branches
SET branchname=?,branchaddress1=?,
branchaddress2=?,branchaddress3=?,branchzip=?,
- branchcity=?,branchcountry=?,branchphone=?,
+ branchcity=?,branch
state=?,branch
country=?,branchphone=?,
branchfax=?,branchemail=?,branchurl=?,branchip=?,
branchprinter=?,branchnotes=?
WHERE branchcode=?
branchfax=?,branchemail=?,branchurl=?,branchip=?,
branchprinter=?,branchnotes=?
WHERE branchcode=?
@@
-235,7
+236,8
@@
sub ModBranch {
$data->{'branchname'},
$data->{'branchaddress1'}, $data->{'branchaddress2'},
$data->{'branchaddress3'}, $data->{'branchzip'},
$data->{'branchname'},
$data->{'branchaddress1'}, $data->{'branchaddress2'},
$data->{'branchaddress3'}, $data->{'branchzip'},
- $data->{'branchcity'}, $data->{'branchcountry'},
+ $data->{'branchcity'}, $data->{'branchstate'},
+ $data->{'branchcountry'},
$data->{'branchphone'}, $data->{'branchfax'},
$data->{'branchemail'}, $data->{'branchurl'},
$data->{'branchip'}, $data->{'branchprinter'},
$data->{'branchphone'}, $data->{'branchfax'},
$data->{'branchemail'}, $data->{'branchurl'},
$data->{'branchip'}, $data->{'branchprinter'},