@@ -, +, @@
---
installer/data/mysql/updatedatabase.pl | 4 +-
.../prog/en/modules/members/memberentrygen.tt | 49 +++++++++++++-------
members/memberentry.pl | 11 ----
3 files changed, 34 insertions(+), 30 deletions(-)
--- a/installer/data/mysql/updatedatabase.pl
+++ a/installer/data/mysql/updatedatabase.pl
@@ -8014,8 +8014,8 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
$DBversion = "XXX";
if ( CheckVersion($DBversion) ) {
- $dbh->do("ALTER TABLE `borrowers` ADD COLUMN `contactprincipal` VARCHAR(45) NULL DEFAULT NULL;");
- print "Upgrade to $DBversion done (Add the contactprincipal column to the borrowers table)\n";
+ $dbh->do("ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL;");
+ print "Upgrade to $DBversion done (Add the primary_contact_method column to the borrowers table)\n";
SetVersion($DBversion);
}
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -643,35 +643,50 @@
[% IF ( mandatoryfax ) %]Required[% END %]
-
-
[% END %]
-[%END # hide fieldset %]
+[% END # hide fieldset %]
[% END %]
--- a/members/memberentry.pl
+++ a/members/memberentry.pl
@@ -526,17 +526,6 @@ $template->param('typeloop' => \@typeloop,
no_categories => $no_categories);
if($no_categories){ $no_add = 1; }
-my @contactprincipalloop;
-foreach (qw(phone phonepro mobile email emailpro fax)) {
- push @contactprincipalloop,{
- 'code' => $_,
- 'selected' => (defined($borrower_data->{'contactprincipal'}) &&
- $_ eq $borrower_data->{'contactprincipal'}),
- 'currentis_' . $_ => 1
- };
-}
-$template->param('contactprincipalloop' => \@contactprincipalloop);
-
# test in city
if ( $guarantorid ) {
$select_city = getidcity($data{city});
--