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

(-)a/admin/systempreferences.pl (+1 lines)
Lines 223-228 $tabsysprefs{intranetreadinghistory} = "Patrons"; Link Here
223
$tabsysprefs{NotifyBorrowerDeparture}      = "Patrons";
223
$tabsysprefs{NotifyBorrowerDeparture}      = "Patrons";
224
$tabsysprefs{memberofinstitution}          = "Patrons";
224
$tabsysprefs{memberofinstitution}          = "Patrons";
225
$tabsysprefs{BorrowerMandatoryField}       = "Patrons";
225
$tabsysprefs{BorrowerMandatoryField}       = "Patrons";
226
$tabsysprefs{BorrowerUnwantedField}        = "Patrons";
226
$tabsysprefs{borrowerRelationship}         = "Patrons";
227
$tabsysprefs{borrowerRelationship}         = "Patrons";
227
$tabsysprefs{BorrowersTitles}              = "Patrons";
228
$tabsysprefs{BorrowersTitles}              = "Patrons";
228
$tabsysprefs{patronimages}                 = "Patrons";
229
$tabsysprefs{patronimages}                 = "Patrons";
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 323-326 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( Link Here
323
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.|do not ask for confirmation.', 'Choice');
323
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', 'always ask for confirmation.|do not ask for confirmation.', 'Choice');
324
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
324
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('MARCAuthorityControlField008', '|| aca||aabn           | a|a     d', NULL, NULL, 'Textarea');
325
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
325
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpenLibraryCovers',0,'If ON Openlibrary book covers will be show',NULL,'YesNo');
326
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerUnwantedField','','Name the fields you don\'t need to store for a patron\'s account',NULL,'free');
326
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);
327
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OpacKohaUrl','1',"Show 'Powered by Koha' text on OPAC footer.",NULL,NULL);
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 4476-4481 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
4476
    SetVersion($DBversion);
4476
    SetVersion($DBversion);
4477
}
4477
}
4478
4478
4479
$DBversion = "3.05.00.XXX";
4480
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4481
    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerUnwantedField','','Name the fields you don\'t need to store for a patron\'s account',NULL,'free')");
4482
    print "Upgrade to $DBversion done (BorrowerUnwantedField syspref)\n";
4483
    SetVersion ($DBversion);
4484
}
4485
4479
=head1 FUNCTIONS
4486
=head1 FUNCTIONS
4480
4487
4481
=head2 DropAllForeignKeys($table)
4488
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (+5 lines)
Lines 32-37 Patrons: Link Here
32
           class: multi
32
           class: multi
33
         - (separate columns with |)
33
         - (separate columns with |)
34
     -
34
     -
35
         - "The following database columns will not appear on the patron entry screen:"
36
         - pref: BorrowerUnwantedField
37
           class: multi
38
         - (separate columns with |)
39
     -
35
         - "Guarantors can be the following of those they guarantee:"
40
         - "Guarantors can be the following of those they guarantee:"
36
         - pref: borrowerRelationship
41
         - pref: borrowerRelationship
37
           class: multi
42
           class: multi
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt (+1 lines)
Lines 22-27 Link Here
22
	<li>Enter the identifying information regarding your patron
22
	<li>Enter the identifying information regarding your patron
23
<ul>
23
<ul>
24
	<li>Required fields are defined in the BorrowerMandatoryField system preference</li>
24
	<li>Required fields are defined in the BorrowerMandatoryField system preference</li>
25
	<li>Unwanted fields are defined in the BorrowerUnwantedField system preference</li>
25
	<li>Salutation is populated by the BorrowersTitles system preference</li>
26
	<li>Salutation is populated by the BorrowersTitles system preference</li>
26
</ul>
27
</ul>
27
</li>
28
</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-4 / +120 lines)
Lines 178-187 Link Here
178
[% END %]
178
[% END %]
179
179
180
[% IF ( step_1 ) %]
180
[% IF ( step_1 ) %]
181
[%UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %]
181
	<fieldset class="rows" id="memberentry_identity">
182
	<fieldset class="rows" id="memberentry_identity">
182
		<legend>[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend>
183
		<legend>[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend>
183
		<ol>
184
		<ol>
184
		[% UNLESS ( I ) %]
185
		[% UNLESS ( I ) %]
186
        [% UNLESS notitle %]
185
		[% IF ( title_cgipopup ) %]
187
		[% IF ( title_cgipopup ) %]
186
            <li>
188
            <li>
187
            [% IF ( mandatorytitle ) %]
189
            [% IF ( mandatorytitle ) %]
Lines 195-200 Link Here
195
            </li>
197
            </li>
196
		[% END %]
198
		[% END %]
197
        [% END %]
199
        [% END %]
200
		[% END %]
201
        [% UNLESS nosurname %]
198
		<li>
202
		<li>
199
		[% IF ( mandatorysurname ) %]
203
		[% IF ( mandatorysurname ) %]
200
		<label for="surname" class="required">
204
		<label for="surname" class="required">
Lines 217-223 Link Here
217
		[% END %]
221
		[% END %]
218
		[% IF ( mandatorysurname ) %]<span class="required">Required</span>[% END %]
222
		[% IF ( mandatorysurname ) %]<span class="required">Required</span>[% END %]
219
		</li>
223
		</li>
224
        [% END %]
220
		[% UNLESS ( I ) %]
225
		[% UNLESS ( I ) %]
226
        [% UNLESS nofirstname %]
221
            <li>
227
            <li>
222
                [% IF ( mandatoryfirstname ) %]
228
                [% IF ( mandatoryfirstname ) %]
223
                <label for="firstname" class="required">
229
                <label for="firstname" class="required">
Lines 228-233 Link Here
228
                <input type="text" id="firstname" name="firstname" size="20"  value="[% IF ( opduplicate ) %][% ELSE %][% firstname %][% END %]" />
234
                <input type="text" id="firstname" name="firstname" size="20"  value="[% IF ( opduplicate ) %][% ELSE %][% firstname %][% END %]" />
229
                [% IF ( mandatoryfirstname ) %]<span class="required">Required</span>[% END %]
235
                [% IF ( mandatoryfirstname ) %]<span class="required">Required</span>[% END %]
230
            </li>
236
            </li>
237
        [% END %]
238
        [% UNLESS nodateofbirth %]
231
            <li>
239
            <li>
232
                [% IF ( mandatorydateofbirth ) %]
240
                [% IF ( mandatorydateofbirth ) %]
233
                <label for="dateofbirth" class="required">
241
                <label for="dateofbirth" class="required">
Lines 256-261 Link Here
256
        [% IF ( ERROR_dateofbirth ) %]<span class="required">(Error)</span>[% END %]
264
        [% IF ( ERROR_dateofbirth ) %]<span class="required">(Error)</span>[% END %]
257
		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
265
		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
258
            </li>
266
            </li>
267
        [% END %]
268
        [% UNLESS noinitials %]
259
            <li>
269
            <li>
260
                [% IF ( mandatoryinitials ) %]
270
                [% IF ( mandatoryinitials ) %]
261
                    <label for="initials" class="required">
271
                    <label for="initials" class="required">
Lines 271-276 Link Here
271
                [% IF ( mandatoryinitials ) %]<span class="required">Required</span>[% END %]
281
                [% IF ( mandatoryinitials ) %]<span class="required">Required</span>[% END %]
272
            </li>
282
            </li>
273
        [% END %]
283
        [% END %]
284
        [% END %]
285
        [% UNLESS noothernames %]
274
		<li>
286
		<li>
275
			[% IF ( mandatoryothernames ) %]
287
			[% IF ( mandatoryothernames ) %]
276
			<label for="othernames" class="required">
288
			<label for="othernames" class="required">
Lines 286-292 Link Here
286
[% IF ( mandatoryothernames ) %]<span class="required">Required</span>[% END %]
298
[% IF ( mandatoryothernames ) %]<span class="required">Required</span>[% END %]
287
		[% IF ( I ) %]<input type="hidden" name="sex" value="N" />[% END %]
299
		[% IF ( I ) %]<input type="hidden" name="sex" value="N" />[% END %]
288
		</li>
300
		</li>
301
        [% END %]
289
    [% UNLESS ( I ) %]
302
    [% UNLESS ( I ) %]
303
        [% UNLESS nosex %]
290
		<li class="radio">
304
		<li class="radio">
291
		
305
		
292
		[% IF ( female ) %]
306
		[% IF ( female ) %]
Lines 305-313 Link Here
305
				<label for="sex-none">N/A </label><input type="radio" name="sex" id="sex-none" value="" />
319
				<label for="sex-none">N/A </label><input type="radio" name="sex" id="sex-none" value="" />
306
[% END %]
320
[% END %]
307
       	</li>
321
       	</li>
322
        [% END %]
308
    [% END %]
323
    [% END %]
309
		</ol>
324
		</ol>
310
	</fieldset>
325
	</fieldset>
326
[% END # hide fieldset %]    
311
	
327
	
312
[% IF ( showguarantor ) %]<input type="hidden" id="guarantorid" name="guarantorid"   value="[% guarantorid %]" />
328
[% IF ( showguarantor ) %]<input type="hidden" id="guarantorid" name="guarantorid"   value="[% guarantorid %]" />
313
    <fieldset class="rows">
329
    <fieldset class="rows">
Lines 343-348 Link Here
343
 [% END %]
359
 [% END %]
344
     <span class="label">Patron #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid %]" target="blank">[% guarantorid %]</a>[% END %]
360
     <span class="label">Patron #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid %]" target="blank">[% guarantorid %]</a>[% END %]
345
 </li>
361
 </li>
362
        [% UNLESS nocontactname %]
346
 <li>
363
 <li>
347
     <label for="contactname">Surname: </label>
364
     <label for="contactname">Surname: </label>
348
     [% IF ( guarantorid ) %]
365
     [% IF ( guarantorid ) %]
Lines 356-361 Link Here
356
		[% END %]
373
		[% END %]
357
     [% END %]
374
     [% END %]
358
 </li>
375
 </li>
376
        [% END %]
377
        [% UNLESS nocontactfirstname %]
359
 <li>
378
 <li>
360
     <label for="contactfirstname">First name: </label>
379
     <label for="contactfirstname">First name: </label>
361
     [% IF ( guarantorid ) %]
380
     [% IF ( guarantorid ) %]
Lines 369-374 Link Here
369
	     [% END %]
388
	     [% END %]
370
     [% END %]
389
     [% END %]
371
 </li>
390
 </li>
391
        [% END %]
372
 [% IF ( relshiploop ) %]
392
 [% IF ( relshiploop ) %]
373
 <li>
393
 <li>
374
     <label for="relationship">Relationship: </label>
394
     <label for="relationship">Relationship: </label>
Lines 398-405 Link Here
398
    </fieldset>
418
    </fieldset>
399
419
400
[% END %]
420
[% END %]
421
[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
401
<fieldset class="rows">
422
<fieldset class="rows">
402
    <legend>Main address</legend><ol>
423
    <legend>Main address</legend><ol>
424
        [% UNLESS nostreetnumber %]
403
    <li>
425
    <li>
404
      [% IF ( mandatorystreetnumber ) %]
426
      [% IF ( mandatorystreetnumber ) %]
405
      <label for="streetnumber" class="required">
427
      <label for="streetnumber" class="required">
Lines 414-419 Link Here
414
      [% END %]
436
      [% END %]
415
[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
437
[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
416
    </li>
438
    </li>
439
        [% END %]
440
        [% UNLESS nostreettype %]
417
    [% IF ( road_cgipopup ) %]
441
    [% IF ( road_cgipopup ) %]
418
      <li>
442
      <li>
419
      [% IF ( mandatorystreettype ) %]
443
      [% IF ( mandatorystreettype ) %]
Lines 426-431 Link Here
426
	  [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
450
	  [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
427
      </li>
451
      </li>
428
    [% END %] 
452
    [% END %] 
453
        [% END %]
454
        [% UNLESS noaddress %]
429
    <li>
455
    <li>
430
      [% IF ( mandatoryaddress ) %]
456
      [% IF ( mandatoryaddress ) %]
431
      <label for="address" class="required">
457
      <label for="address" class="required">
Lines 440-445 Link Here
440
      [% END %]
466
      [% END %]
441
	  [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
467
	  [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
442
    </li>
468
    </li>
469
        [% END %]
470
        [% UNLESS noaddress2 %]
443
    <li>
471
    <li>
444
      [% IF ( mandatoryaddress2 ) %]
472
      [% IF ( mandatoryaddress2 ) %]
445
      <label for="address2" class="required">
473
      <label for="address2" class="required">
Lines 454-459 Link Here
454
      [% END %]
482
      [% END %]
455
	  [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
483
	  [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
456
    </li>  
484
    </li>  
485
        [% END %]
486
        [% UNLESS nocity %]
457
    <li>
487
    <li>
458
      [% IF ( mandatorycity ) %]
488
      [% IF ( mandatorycity ) %]
459
        <label for="city" class="required">
489
        <label for="city" class="required">
Lines 481-486 Link Here
481
        [% END %]
511
        [% END %]
482
	  [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
512
	  [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
483
    </li>
513
    </li>
514
        [% END %]
515
        [% UNLESS nostate %]
484
    <li> 
516
    <li> 
485
      [% IF ( mandatorystate ) %]
517
      [% IF ( mandatorystate ) %]
486
        <label for="state" class="required">
518
        <label for="state" class="required">
Lines 491-496 Link Here
491
      <input type="text" name="state" id="state" size="20" value="[% state %]" />
523
      <input type="text" name="state" id="state" size="20" value="[% state %]" />
492
	  [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
524
	  [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
493
    </li>
525
    </li>
526
        [% END %]
527
        [% UNLESS nozipcode %]
494
    <li> 
528
    <li> 
495
      [% IF ( mandatoryzipcode ) %]
529
      [% IF ( mandatoryzipcode ) %]
496
        <label for="zipcode" class="required">
530
        <label for="zipcode" class="required">
Lines 505-511 Link Here
505
      [% END %]
539
      [% END %]
506
	  [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
540
	  [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
507
    </li>
541
    </li>
508
    
542
        [% END %]
543
        [% UNLESS nocountry %]
509
    <li> 
544
    <li> 
510
      [% IF ( mandatorycountry ) %]
545
      [% IF ( mandatorycountry ) %]
511
        <label for="country" class="required">
546
        <label for="country" class="required">
Lines 520-530 Link Here
520
      [% END %]
555
      [% END %]
521
	  [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
556
	  [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
522
    </li>    
557
    </li>    
523
  
558
        [% END %]
524
	</ol>
559
	</ol>
525
    </fieldset>
560
    </fieldset>
561
[% END # nostreet && nocity etc group%]
562
563
[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
526
  <fieldset class="rows" id="memberentry_contact">
564
  <fieldset class="rows" id="memberentry_contact">
527
    <legend>Contact</legend><ol>
565
    <legend>Contact</legend><ol>
566
        [% UNLESS nophone %]
528
      <li>
567
      <li>
529
      [% IF ( mandatoryphone ) %] 
568
      [% IF ( mandatoryphone ) %] 
530
      <label for="phone" class="required">
569
      <label for="phone" class="required">
Lines 540-545 Link Here
540
	  [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
579
	  [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
541
580
542
    </li>
581
    </li>
582
        [% END %]
583
        [% UNLESS nophonepro %]
543
    <li>
584
    <li>
544
      [% IF ( mandatoryphonepro ) %]
585
      [% IF ( mandatoryphonepro ) %]
545
      <label for="phonepro" class="required">
586
      <label for="phonepro" class="required">
Lines 554-559 Link Here
554
      [% END %]
595
      [% END %]
555
	  [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
596
	  [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
556
    </li>
597
    </li>
598
        [% END %]
599
        [% UNLESS nomobile %]
557
    <li>
600
    <li>
558
      [% IF ( mandatorymobile ) %]
601
      [% IF ( mandatorymobile ) %]
559
      <label for="mobile" class="required">
602
      <label for="mobile" class="required">
Lines 568-573 Link Here
568
      [% END %]
611
      [% END %]
569
	  [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
612
	  [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
570
    </li>
613
    </li>
614
        [% END %]
615
        [% UNLESS noemail %]
571
    <li>
616
    <li>
572
      [% IF ( mandatoryemail ) %]
617
      [% IF ( mandatoryemail ) %]
573
      <label for="email" class="required">
618
      <label for="email" class="required">
Lines 583-588 Link Here
583
	  [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
628
	  [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
584
629
585
    </li>
630
    </li>
631
        [% END %]
632
        [% UNLESS noemailpro %]
586
    <li>
633
    <li>
587
      [% IF ( mandatoryemailpro ) %] 
634
      [% IF ( mandatoryemailpro ) %] 
588
      <label for="emailpro" class="required">
635
      <label for="emailpro" class="required">
Lines 597-602 Link Here
597
      [% END %]
644
      [% END %]
598
	  [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
645
	  [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
599
    </li>
646
    </li>
647
        [% END %]
648
        [% UNLESS nofax %]
600
    <li>
649
    <li>
601
      [% IF ( mandatoryfax ) %]
650
      [% IF ( mandatoryfax ) %]
602
      <label for="fax" class="required">
651
      <label for="fax" class="required">
Lines 611-626 Link Here
611
      [% END %]
660
      [% END %]
612
	  [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
661
	  [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
613
    </li>
662
    </li>
663
        [% END %]
614
	</ol>
664
	</ol>
615
  </fieldset>
665
  </fieldset>
616
666
[%END # hide fieldset %]  
617
667
618
<!-- ************************ STEP_1 *********************** -->
668
<!-- ************************ STEP_1 *********************** -->
619
[% END %]
669
[% END %]
620
[% IF ( step_6 ) %]
670
[% IF ( step_6 ) %]
621
671
672
    [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
622
		<fieldset class="rows" id="memberentry_address">
673
		<fieldset class="rows" id="memberentry_address">
623
		<legend>Alternate address</legend><ol>
674
		<legend>Alternate address</legend><ol>
675
        [% UNLESS noB_address %]
624
			<li>
676
			<li>
625
				[% IF ( mandatoryB_address ) %]
677
				[% IF ( mandatoryB_address ) %]
626
					<label for="B_address" class="required">
678
					<label for="B_address" class="required">
Lines 635-640 Link Here
635
				[% END %]
687
				[% END %]
636
	  [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
688
	  [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
637
			</li>
689
			</li>
690
        [% END %]
691
        [% UNLESS noB_address2 %]
638
			<li>
692
			<li>
639
				[% IF ( mandatoryB_address2 ) %]
693
				[% IF ( mandatoryB_address2 ) %]
640
					<label for="B_address2" class="required">
694
					<label for="B_address2" class="required">
Lines 649-654 Link Here
649
				[% END %]
703
				[% END %]
650
	  [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
704
	  [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
651
			</li>
705
			</li>
706
        [% END %]
707
        [% UNLESS noB_city %]
652
			<li>
708
			<li>
653
				[% IF ( mandatoryB_city ) %]
709
				[% IF ( mandatoryB_city ) %]
654
					<label for="B_city" class="required" >
710
					<label for="B_city" class="required" >
Lines 659-664 Link Here
659
				<input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
715
				<input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
660
	  [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
716
	  [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
661
			</li>
717
			</li>
718
        [% END %]
719
        [% UNLESS noB_state %]
662
			<li>
720
			<li>
663
				[% IF ( mandatoryB_state ) %]
721
				[% IF ( mandatoryB_state ) %]
664
					<label for="B_state" class="required" >
722
					<label for="B_state" class="required" >
Lines 669-674 Link Here
669
				<input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
727
				<input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
670
	  [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
728
	  [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
671
			</li>
729
			</li>
730
        [% END %]
731
        [% UNLESS noB_zipcode %]
672
			<li>
732
			<li>
673
				[% IF ( mandatoryB_zipcode ) %]
733
				[% IF ( mandatoryB_zipcode ) %]
674
					<label for="B_zipcode" class="required">
734
					<label for="B_zipcode" class="required">
Lines 683-688 Link Here
683
				[% END %]
743
				[% END %]
684
	  [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
744
	  [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
685
			</li>
745
			</li>
746
        [% END %]
747
        [% UNLESS noB_country %]
686
			<li>
748
			<li>
687
				[% IF ( mandatoryB_country ) %]
749
				[% IF ( mandatoryB_country ) %]
688
					<label for="B_country" class="required">
750
					<label for="B_country" class="required">
Lines 697-702 Link Here
697
				[% END %]
759
				[% END %]
698
	  [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
760
	  [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
699
			</li>
761
			</li>
762
        [% END %]
763
        [% UNLESS noB_phone %]
700
            <li>
764
            <li>
701
                [% IF ( mandatoryB_phone ) %]
765
                [% IF ( mandatoryB_phone ) %]
702
                <label for="B_phone" class="required">
766
                <label for="B_phone" class="required">
Lines 711-716 Link Here
711
                [% END %]
775
                [% END %]
712
                [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
776
                [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
713
            </li>
777
            </li>
778
        [% END %]
779
        [% UNLESS noB_email %]
714
			<li> 
780
			<li> 
715
        [% IF ( mandatoryB_email ) %]
781
        [% IF ( mandatoryB_email ) %]
716
          <label for="B_email" class="required">
782
          <label for="B_email" class="required">
Lines 724-729 Link Here
724
			<input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
790
			<input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
725
		[% END %]
791
		[% END %]
726
		[% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
792
		[% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
793
        [% END %]
794
        [% UNLESS nocontactnote %]
727
            <li>
795
            <li>
728
                [% IF ( mandatorycontactnote ) %]
796
                [% IF ( mandatorycontactnote ) %]
729
                <label for="contactnote" class="required">
797
                <label for="contactnote" class="required">
Lines 734-745 Link Here
734
                <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% contactnote %]</textarea>
802
                <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% contactnote %]</textarea>
735
        [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
803
        [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
736
            </li>
804
            </li>
805
        [% END %]
737
			</ol>
806
			</ol>
738
		</fieldset>
807
		</fieldset>
808
    [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
739
[% END %]		
809
[% END %]		
740
[% IF ( step_2 ) %]
810
[% IF ( step_2 ) %]
811
    [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
741
		<fieldset class="rows" id="memberentry_altaddress">       
812
		<fieldset class="rows" id="memberentry_altaddress">       
742
		    <legend>Alternate Contact</legend><ol>
813
		    <legend>Alternate Contact</legend><ol>
814
        [% UNLESS noaltcontactsurname %]
743
			<li>
815
			<li>
744
			    [% IF ( mandatoryaltcontactsurname ) %]
816
			    [% IF ( mandatoryaltcontactsurname ) %]
745
				<label for="altcontactsurname" class="required">
817
				<label for="altcontactsurname" class="required">
Lines 754-759 Link Here
754
				[% END %]
826
				[% END %]
755
				[% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
827
				[% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
756
			</li>
828
			</li>
829
        [% END %]
830
        [% UNLESS noaltcontactfirstname %]
757
			<li>
831
			<li>
758
			    [% IF ( mandatoryaltcontactfirstname ) %]
832
			    [% IF ( mandatoryaltcontactfirstname ) %]
759
				<label for="altcontactfirstname" class="required">
833
				<label for="altcontactfirstname" class="required">
Lines 768-773 Link Here
768
				[% END %]
842
				[% END %]
769
				[% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
843
				[% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
770
			</li>
844
			</li>
845
        [% END %]
846
        [% UNLESS noaltcontactaddress1 %]
771
			<li>
847
			<li>
772
			    [% IF ( mandatoryaltcontactaddress1 ) %]
848
			    [% IF ( mandatoryaltcontactaddress1 ) %]
773
				<label for="altcontactaddress1" class="required">
849
				<label for="altcontactaddress1" class="required">
Lines 782-787 Link Here
782
				[% END %]
858
				[% END %]
783
				[% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
859
				[% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
784
			</li>
860
			</li>
861
        [% END %]
862
        [% UNLESS noaltcontactaddress2 %]
785
			<li>
863
			<li>
786
			    [% IF ( mandatoryaltcontactaddress2 ) %]
864
			    [% IF ( mandatoryaltcontactaddress2 ) %]
787
				<label for="altcontactaddress2" class="required">
865
				<label for="altcontactaddress2" class="required">
Lines 796-801 Link Here
796
				[% END %]
874
				[% END %]
797
				[% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
875
				[% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
798
			</li>
876
			</li>
877
        [% END %]
878
        [% UNLESS noaltcontactaddress3 %]
799
			<li>
879
			<li>
800
			    [% IF ( mandatoryaltcontactaddress3 ) %]
880
			    [% IF ( mandatoryaltcontactaddress3 ) %]
801
				<label for="altcontactaddress3" class="required">
881
				<label for="altcontactaddress3" class="required">
Lines 806-811 Link Here
806
				<input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
886
				<input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
807
				[% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
887
				[% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
808
			</li>
888
			</li>
889
        [% END %]
890
        [% UNLESS noaltcontactstate %]
809
			<li>
891
			<li>
810
			    [% IF ( mandatoryaltcontactstate ) %]
892
			    [% IF ( mandatoryaltcontactstate ) %]
811
				<label for="altcontactstate" class="required">
893
				<label for="altcontactstate" class="required">
Lines 816-821 Link Here
816
				<input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
898
				<input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
817
				[% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
899
				[% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
818
			</li>
900
			</li>
901
        [% END %]
902
        [% UNLESS noaltcontactzipcode %]
819
			<li>
903
			<li>
820
			    [% IF ( mandatoryaltcontactzipcode ) %]
904
			    [% IF ( mandatoryaltcontactzipcode ) %]
821
				<label for="altcontactzipcode" class="required">
905
				<label for="altcontactzipcode" class="required">
Lines 830-835 Link Here
830
				[% END %]
914
				[% END %]
831
				[% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
915
				[% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
832
			</li>
916
			</li>
917
        [% END %]
918
        [% UNLESS noaltcontactcountry %]
833
			<li>
919
			<li>
834
			    [% IF ( mandatoryaltcontactcountry ) %]
920
			    [% IF ( mandatoryaltcontactcountry ) %]
835
				<label for="altcontactcountry" class="required">
921
				<label for="altcontactcountry" class="required">
Lines 844-849 Link Here
844
				[% END %]
930
				[% END %]
845
				[% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
931
				[% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
846
			</li>			
932
			</li>			
933
        [% END %]
934
        [% UNLESS noaltcontactphone %]
847
			<li>
935
			<li>
848
			    [% IF ( mandatoryaltcontactphone ) %]
936
			    [% IF ( mandatoryaltcontactphone ) %]
849
				<label for="altcontactphone" class="required">
937
				<label for="altcontactphone" class="required">
Lines 858-871 Link Here
858
				[% END %]
946
				[% END %]
859
				[% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
947
				[% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
860
			</li>
948
			</li>
949
        [% END %]
861
            </ol>
950
            </ol>
862
        </fieldset>
951
        </fieldset>
952
    [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %]
863
953
864
[% END %]
954
[% END %]
865
[% IF ( step_3 ) %]
955
[% IF ( step_3 ) %]
866
956
867
  <fieldset class="rows" id="memberentry_library_management">
957
  <fieldset class="rows" id="memberentry_library_management">
868
    <legend>Library Management</legend><ol>
958
    <legend>Library Management</legend><ol>
959
        [% UNLESS nocardnumber %]
869
   <li> [% IF ( mandatorycardnumber ) %]
960
   <li> [% IF ( mandatorycardnumber ) %]
870
      <label for="cardnumber" class="required">
961
      <label for="cardnumber" class="required">
871
    [% ELSE %]
962
    [% ELSE %]
Lines 878-883 Link Here
878
		<input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber %]" />
969
		<input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber %]" />
879
    [% END %]
970
    [% END %]
880
	  [% IF ( mandatorycardnumber ) %]<span class="required">Required</span>[% END %]</li>
971
	  [% IF ( mandatorycardnumber ) %]<span class="required">Required</span>[% END %]</li>
972
        [% END %]
973
        [% UNLESS nobranchcode %]
881
    <li>
974
    <li>
882
      [% IF ( mandatorybranchcode ) %]
975
      [% IF ( mandatorybranchcode ) %]
883
        <label for="branchcode" class="required">
976
        <label for="branchcode" class="required">
Lines 888-893 Link Here
888
      [% CGIbranch %]
981
      [% CGIbranch %]
889
	  [% IF ( mandatorybranchcode ) %]<span class="required">Required</span>[% END %]
982
	  [% IF ( mandatorybranchcode ) %]<span class="required">Required</span>[% END %]
890
    </li>
983
    </li>
984
        [% END %]
891
    <li>
985
    <li>
892
        <label for="categorycode">Category: </label>
986
        <label for="categorycode">Category: </label>
893
        <select id="categorycode" name="categorycode">
987
        <select id="categorycode" name="categorycode">
Lines 913-918 Link Here
913
       [% END %]
1007
       [% END %]
914
       </select>
1008
       </select>
915
    </li>
1009
    </li>
1010
        [% UNLESS nosort1 %]
916
    <li>
1011
    <li>
917
      [% IF ( mandatorysort1 ) %]
1012
      [% IF ( mandatorysort1 ) %]
918
        <label for="sort1" class="required">
1013
        <label for="sort1" class="required">
Lines 927-932 Link Here
927
	  [% IF ( mandatorysort1 ) %]<span class="required">Required</span>[% END %]
1022
	  [% IF ( mandatorysort1 ) %]<span class="required">Required</span>[% END %]
928
      [% END %]   
1023
      [% END %]   
929
    </li>
1024
    </li>
1025
        [% END %]
1026
        [% UNLESS nosort2 %]
930
    <li>
1027
    <li>
931
    [% IF ( mandatorysort2 ) %]
1028
    [% IF ( mandatorysort2 ) %]
932
    <label for="sort2" class="required">
1029
    <label for="sort2" class="required">
Lines 945-954 Link Here
945
	  [% IF ( mandatorysort2 ) %]<span class="required">Required</span>[% END %]
1042
	  [% IF ( mandatorysort2 ) %]<span class="required">Required</span>[% END %]
946
    [% END %] 
1043
    [% END %] 
947
    </li>
1044
    </li>
1045
        [% END %]
948
	</ol>
1046
	</ol>
949
  </fieldset>
1047
  </fieldset>
1048
    [% UNLESS nodateenrolled && nodateexpiry &&  noopacnote && noborrowernotes %]
950
	<fieldset class="rows" id="memberentry_subscription">
1049
	<fieldset class="rows" id="memberentry_subscription">
951
	<legend>Library set-up</legend><ol>
1050
	<legend>Library set-up</legend><ol>
1051
        [% UNLESS nodateenrolled %]
952
		<li>
1052
		<li>
953
			[% IF ( mandatorydateenrolled ) %]
1053
			[% IF ( mandatorydateenrolled ) %]
954
			<label for="dateenrolled" class="required">
1054
			<label for="dateenrolled" class="required">
Lines 975-980 Link Here
975
		[% IF ( ERROR_dateenrolled ) %]<span class="required">(Error)</span>[% END %]
1075
		[% IF ( ERROR_dateenrolled ) %]<span class="required">(Error)</span>[% END %]
976
		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
1076
		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
977
		</li>
1077
		</li>
1078
        [% END %]
1079
        [% UNLESS nodateexpiry %]
978
		<li>
1080
		<li>
979
			[% IF ( mandatorydateexpiry ) %]
1081
			[% IF ( mandatorydateexpiry ) %]
980
			<label for="dateexpiry" class="required">
1082
			<label for="dateexpiry" class="required">
Lines 1009-1014 Link Here
1009
		[% IF ( ERROR_dateexpiry ) %]<span class="required">(Error)</span>[% END %]
1111
		[% IF ( ERROR_dateexpiry ) %]<span class="required">(Error)</span>[% END %]
1010
		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
1112
		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
1011
		</li>
1113
		</li>
1114
        [% END %]
1115
        [% UNLESS noopacnote %]
1012
		<li>
1116
		<li>
1013
			[% IF ( mandatoryopacnote ) %]
1117
			[% IF ( mandatoryopacnote ) %]
1014
				<label for="opacnote" class="required">
1118
				<label for="opacnote" class="required">
Lines 1020-1025 Link Here
1020
			<div class="hint">This message appears on this patron's user page in the OPAC</div>
1124
			<div class="hint">This message appears on this patron's user page in the OPAC</div>
1021
	  [% IF ( mandatoryopacnote ) %]<span class="required">Required</span>[% END %]
1125
	  [% IF ( mandatoryopacnote ) %]<span class="required">Required</span>[% END %]
1022
		</li>
1126
		</li>
1127
        [% END %]
1128
        [% UNLESS noborrowernotes %]
1023
		<li>
1129
		<li>
1024
			[% IF ( mandatoryborrowernotes ) %]	
1130
			[% IF ( mandatoryborrowernotes ) %]	
1025
				<label for="borrowernotes" class="required">
1131
				<label for="borrowernotes" class="required">
Lines 1031-1040 Link Here
1031
			<div class="hint">This message displays when checking out to this patron</div>
1137
			<div class="hint">This message displays when checking out to this patron</div>
1032
	  [% IF ( mandatoryborrowernotes ) %]<span class="required">Required</span>[% END %]
1138
	  [% IF ( mandatoryborrowernotes ) %]<span class="required">Required</span>[% END %]
1033
		</li>
1139
		</li>
1140
        [% END %]
1034
		</ol>
1141
		</ol>
1035
	</fieldset>
1142
	</fieldset>
1143
    [% END # hide fieldset %]
1144
1145
    [% UNLESS nouserid && nopassword %]
1036
	<fieldset class="rows" id="memberentry_userid">
1146
	<fieldset class="rows" id="memberentry_userid">
1037
		<legend>OPAC/Staff Login</legend><ol>
1147
		<legend>OPAC/Staff Login</legend><ol>
1148
        [% UNLESS nouserid %]
1038
		<li>
1149
		<li>
1039
			[% IF ( mandatoryuserid ) %]
1150
			[% IF ( mandatoryuserid ) %]
1040
			<label for="userid" class="required">
1151
			<label for="userid" class="required">
Lines 1059-1064 Link Here
1059
1170
1060
	  [% IF ( mandatoryuserid ) %]<span class="required">Required</span>[% END %]
1171
	  [% IF ( mandatoryuserid ) %]<span class="required">Required</span>[% END %]
1061
		</li>
1172
		</li>
1173
        [%END %]
1174
        [% UNLESS nopassword %]
1062
		<li>
1175
		<li>
1063
			[% IF ( mandatorypassword ) %]
1176
			[% IF ( mandatorypassword ) %]
1064
			<label for="password" class="required">
1177
			<label for="password" class="required">
Lines 1101-1108 Link Here
1101
			[% END %]
1214
			[% END %]
1102
	  [% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %][% IF ( ERROR_short_password ) %]<span class="required">Password is too short</span>[% END %]
1215
	  [% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %][% IF ( ERROR_short_password ) %]<span class="required">Password is too short</span>[% END %]
1103
[% IF ( minPasswordLength ) %]<div class="hint">Minimum password length: [% minPasswordLength %]</div>[% END %]
1216
[% IF ( minPasswordLength ) %]<div class="hint">Minimum password length: [% minPasswordLength %]</div>[% END %]
1104
		</li></ol>
1217
		</li>
1218
        [% END %]
1219
    </ol>
1105
		</fieldset>
1220
		</fieldset>
1221
        [% END # hide fieldset %]
1106
		<!--this zones are not necessary in modif mode -->
1222
		<!--this zones are not necessary in modif mode -->
1107
		[% UNLESS ( opadd ) %]
1223
		[% UNLESS ( opadd ) %]
1108
		<fieldset class="rows">
1224
		<fieldset class="rows">
(-)a/members/memberentry.pl (-1 / +7 lines)
Lines 100-105 my @field_check=split(/\|/,$check_BorrowerMandatoryField); Link Here
100
foreach (@field_check) {
100
foreach (@field_check) {
101
	$template->param( "mandatory$_" => 1);    
101
	$template->param( "mandatory$_" => 1);    
102
}
102
}
103
# function to designate unwanted fields
104
my $check_BorrowerUnwantedField=C4::Context->preference("BorrowerUnwantedField");
105
@field_check=split(/\|/,$check_BorrowerUnwantedField);
106
foreach (@field_check) {
107
    next unless m/\w/o;
108
	$template->param( "no$_" => 1);    
109
}
103
$template->param( "add" => 1 ) if ( $op eq 'add' );
110
$template->param( "add" => 1 ) if ( $op eq 'add' );
104
$template->param( "duplicate" => 1 ) if ( $op eq 'duplicate' );
111
$template->param( "duplicate" => 1 ) if ( $op eq 'duplicate' );
105
$template->param( "checked" => 1 ) if ( defined($nodouble) && $nodouble eq 1 );
112
$template->param( "checked" => 1 ) if ( defined($nodouble) && $nodouble eq 1 );
106
- 

Return to bug 6190