@@ -, +, @@
---
installer/data/mysql/updatedatabase.pl | 13 +++--
.../prog/en/modules/members/memberentrygen.tt | 68 +++++++++++++---------
members/memberentry.pl | 12 ++++
3 files changed, 60 insertions(+), 33 deletions(-)
--- a/installer/data/mysql/updatedatabase.pl
+++ a/installer/data/mysql/updatedatabase.pl
@@ -8672,12 +8672,6 @@ if ( CheckVersion($DBversion) ) {
print "Upgrade to $DBversion done (Bug 10402: Move bookseller contacts to separate table)\n";
SetVersion($DBversion);
}
-$DBversion = "XXX";
-if ( CheckVersion($DBversion) ) {
- $dbh->do("ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL;");
- print "Upgrade to $DBversion done (Bug 11879: Add a new borrower field : main contact method)\n";
- SetVersion($DBversion);
-}
$DBversion = "3.17.00.017";
if ( CheckVersion($DBversion) ) {
@@ -9591,6 +9585,13 @@ if ( CheckVersion($DBversion) ) {
SetVersion ($DBversion);
}
+$DBversion = "XXX";
+if ( CheckVersion($DBversion) ) {
+ $dbh->do("ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL;");
+ print "Upgrade to $DBversion done (Bug 11879: Add a new borrower field : main contact method)\n";
+ SetVersion($DBversion);
+}
+
=head1 FUNCTIONS
=head2 TableExists($table)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -637,7 +637,7 @@
[% IF ( mandatoryemailpro ) %]Required[% END %]
[% END %]
- [% UNLESS nofax %]
+ [% UNLESS nofax %]
[% IF ( mandatoryfax ) %]
+ [% END %]
- [% END %]
-
+
[%END # hide fieldset %]
--- a/members/memberentry.pl
+++ a/members/memberentry.pl
@@ -547,6 +547,18 @@ foreach (qw(C A S P I X)) {
$template->param('typeloop' => \@typeloop,
no_categories => $no_categories);
if($no_categories){ $no_add = 1; }
+
+my @contactprincipalloop;
+my @fieldArray = qw(phone phonepro mobile email emailpro fax);
+foreach my $field (@fieldArray) {
+ if ( !(grep { $field eq $_ } @field_check)){
+ push @contactprincipalloop,{
+ 'currentis_' . $field => 1
+ };
+ }
+}
+$template->param('contactprincipalloop' => \@contactprincipalloop);
+
# test in city
if ( $guarantorid ) {
$select_city = getidcity($data{city});
--