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

(-)a/installer/data/mysql/sysprefs.sql (-2 / +2 lines)
Lines 8-13 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
8
('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),
8
('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),
9
('AddPatronLists','categorycode','categorycode|category_type','Allow user to choose what list to pick up from when adding patrons','Choice'),
9
('AddPatronLists','categorycode','categorycode|category_type','Allow user to choose what list to pick up from when adding patrons','Choice'),
10
('advancedMARCeditor','0','','If ON, the MARC editor won\'t display field/subfield descriptions','YesNo'),
10
('advancedMARCeditor','0','','If ON, the MARC editor won\'t display field/subfield descriptions','YesNo'),
11
('addressformat','us','','Choose format to display postal addresses', 'Choice'),
11
('AdvancedSearchLanguages','','','ISO 639-2 codes of languages you wish to see appear as an Advanced search option.  Example: eng|fre|ita','Textarea'),
12
('AdvancedSearchLanguages','','','ISO 639-2 codes of languages you wish to see appear as an Advanced search option.  Example: eng|fre|ita','Textarea'),
12
('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice'),
13
('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice'),
13
('AgeRestrictionMarker','',NULL,'Markers for age restriction indication, e.g. FSK|PEGI|Age|','free'),
14
('AgeRestrictionMarker','',NULL,'Markers for age restriction indication, e.g. FSK|PEGI|Age|','free'),
Lines 474-479 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
474
('XSLTDetailsDisplay','default','','Enable XSL stylesheet control over details page display on intranet','Free'),
475
('XSLTDetailsDisplay','default','','Enable XSL stylesheet control over details page display on intranet','Free'),
475
('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),
476
('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),
476
('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
477
('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
477
('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo'),
478
('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo')
478
('addressformat','us','','Choose format to display postal addresses', 'Choice')
479
;
479
;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc (-51 / +51 lines)
Lines 1-28 Link Here
1
		<fieldset class="rows" id="memberentry_address">
1
        <fieldset class="rows" id="memberentry_address">
2
		<legend id="alt_address_lgd">Alternate address</legend><ol>
2
        <legend id="alt_address_lgd">Alternate address</legend><ol>
3
        [% UNLESS noB_address %]
3
        [% UNLESS noB_address %]
4
			<li>
4
            <li>
5
				[% IF ( mandatoryB_address ) %]
5
                [% IF ( mandatoryB_address ) %]
6
					<label for="B_address" class="required">
6
                    <label for="B_address" class="required">
7
				[% ELSE %]
7
                [% ELSE %]
8
					<label for="B_address">
8
                    <label for="B_address">
9
				[% END %]
9
                [% END %]
10
				Address: </label>
10
                Address: </label>
11
                    <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" />
11
                    <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" />
12
	  [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
12
      [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
13
			</li>
13
            </li>
14
        [% END %]
14
        [% END %]
15
        [% UNLESS noB_address2 %]
15
        [% UNLESS noB_address2 %]
16
			<li>
16
            <li>
17
				[% IF ( mandatoryB_address2 ) %]
17
                [% IF ( mandatoryB_address2 ) %]
18
					<label for="B_address2" class="required">
18
                    <label for="B_address2" class="required">
19
				[% ELSE %]
19
                [% ELSE %]
20
					<label for="B_address2">
20
                    <label for="B_address2">
21
				[% END %]
21
                [% END %]
22
				Address 2: </label>
22
                Address 2: </label>
23
                    <input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" />
23
                    <input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" />
24
	  [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
24
      [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
25
			</li>
25
            </li>
26
        [% END %]
26
        [% END %]
27
        [% UNLESS noB_zipcode %]
27
        [% UNLESS noB_zipcode %]
28
                        <li>
28
                        <li>
Lines 37-76 Link Here
37
                        </li>
37
                        </li>
38
        [% END %]
38
        [% END %]
39
        [% UNLESS noB_city %]
39
        [% UNLESS noB_city %]
40
			<li>
40
            <li>
41
				[% IF ( mandatoryB_city ) %]
41
                [% IF ( mandatoryB_city ) %]
42
					<label for="B_city" class="required" >
42
                    <label for="B_city" class="required" >
43
				[% ELSE %]
43
                [% ELSE %]
44
					<label for="B_city">
44
                    <label for="B_city">
45
				[% END %]
45
                [% END %]
46
				City: </label>
46
                City: </label>
47
                <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
47
                <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
48
	  [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
48
      [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
49
			</li>
49
            </li>
50
        [% END %]
50
        [% END %]
51
        [% UNLESS noB_state %]
51
        [% UNLESS noB_state %]
52
			<li>
52
            <li>
53
				[% IF ( mandatoryB_state ) %]
53
                [% IF ( mandatoryB_state ) %]
54
					<label for="B_state" class="required" >
54
                    <label for="B_state" class="required" >
55
				[% ELSE %]
55
                [% ELSE %]
56
					<label for="B_state">
56
                    <label for="B_state">
57
				[% END %]
57
                [% END %]
58
				State: </label>
58
                State: </label>
59
                <input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
59
                <input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
60
	  [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
60
      [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
61
			</li>
61
            </li>
62
        [% END %]
62
        [% END %]
63
        [% UNLESS noB_country %]
63
        [% UNLESS noB_country %]
64
			<li>
64
            <li>
65
				[% IF ( mandatoryB_country ) %]
65
                [% IF ( mandatoryB_country ) %]
66
					<label for="B_country" class="required">
66
                    <label for="B_country" class="required">
67
				[% ELSE %]
67
                [% ELSE %]
68
					<label for="B_country">
68
                    <label for="B_country">
69
				[% END %]
69
                [% END %]
70
				Country: </label>
70
                Country: </label>
71
                    <input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" />
71
                    <input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" />
72
	  [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
72
      [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
73
			</li>
73
            </li>
74
        [% END %]
74
        [% END %]
75
        [% UNLESS noB_phone %]
75
        [% UNLESS noB_phone %]
76
            <li>
76
            <li>
Lines 85-91 Link Here
85
            </li>
85
            </li>
86
        [% END %]
86
        [% END %]
87
        [% UNLESS noB_email %]
87
        [% UNLESS noB_email %]
88
			<li>
88
            <li>
89
        [% IF ( mandatoryB_email ) %]
89
        [% IF ( mandatoryB_email ) %]
90
          <label for="B_email" class="required">
90
          <label for="B_email" class="required">
91
        [% ELSE %]
91
        [% ELSE %]
Lines 93-99 Link Here
93
        [% END %]
93
        [% END %]
94
        Email: </label>
94
        Email: </label>
95
            <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
95
            <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
96
		[% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
96
        [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
97
        [% END %]
97
        [% END %]
98
        [% UNLESS nocontactnote %]
98
        [% UNLESS nocontactnote %]
99
            <li>
99
            <li>
Lines 107-111 Link Here
107
        [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
107
        [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
108
            </li>
108
            </li>
109
        [% END %]
109
        [% END %]
110
			</ol>
110
            </ol>
111
		</fieldset>
111
        </fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc (-60 / +60 lines)
Lines 1-76 Link Here
1
		<fieldset class="rows" id="memberentry_address">
1
        <fieldset class="rows" id="memberentry_address">
2
		<legend id="alt_address_lgd">Alternate address</legend><ol>
2
        <legend id="alt_address_lgd">Alternate address</legend><ol>
3
        [% UNLESS noB_address %]
3
        [% UNLESS noB_address %]
4
			<li>
4
            <li>
5
				[% IF ( mandatoryB_address ) %]
5
                [% IF ( mandatoryB_address ) %]
6
					<label for="B_address" class="required">
6
                    <label for="B_address" class="required">
7
				[% ELSE %]
7
                [% ELSE %]
8
					<label for="B_address">
8
                    <label for="B_address">
9
				[% END %]
9
                [% END %]
10
				Address: </label>
10
                Address: </label>
11
                    <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" />
11
                    <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" />
12
	  [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
12
      [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
13
			</li>
13
            </li>
14
        [% END %]
14
        [% END %]
15
        [% UNLESS noB_address2 %]
15
        [% UNLESS noB_address2 %]
16
			<li>
16
            <li>
17
				[% IF ( mandatoryB_address2 ) %]
17
                [% IF ( mandatoryB_address2 ) %]
18
					<label for="B_address2" class="required">
18
                    <label for="B_address2" class="required">
19
				[% ELSE %]
19
                [% ELSE %]
20
					<label for="B_address2">
20
                    <label for="B_address2">
21
				[% END %]
21
                [% END %]
22
				Address 2: </label>
22
                Address 2: </label>
23
                    <input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" />
23
                    <input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" />
24
	  [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
24
      [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
25
			</li>
25
            </li>
26
        [% END %]
26
        [% END %]
27
        [% UNLESS noB_city %]
27
        [% UNLESS noB_city %]
28
			<li>
28
            <li>
29
				[% IF ( mandatoryB_city ) %]
29
                [% IF ( mandatoryB_city ) %]
30
					<label for="B_city" class="required" >
30
                    <label for="B_city" class="required" >
31
				[% ELSE %]
31
                [% ELSE %]
32
					<label for="B_city">
32
                    <label for="B_city">
33
				[% END %]
33
                [% END %]
34
				City: </label>
34
                City: </label>
35
                <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
35
                <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
36
	  [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
36
      [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
37
			</li>
37
            </li>
38
        [% END %]
38
        [% END %]
39
        [% UNLESS noB_state %]
39
        [% UNLESS noB_state %]
40
			<li>
40
            <li>
41
				[% IF ( mandatoryB_state ) %]
41
                [% IF ( mandatoryB_state ) %]
42
					<label for="B_state" class="required" >
42
                    <label for="B_state" class="required" >
43
				[% ELSE %]
43
                [% ELSE %]
44
					<label for="B_state">
44
                    <label for="B_state">
45
				[% END %]
45
                [% END %]
46
				State: </label>
46
                State: </label>
47
                <input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
47
                <input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
48
	  [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
48
      [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
49
			</li>
49
            </li>
50
        [% END %]
50
        [% END %]
51
        [% UNLESS noB_zipcode %]
51
        [% UNLESS noB_zipcode %]
52
			<li>
52
            <li>
53
				[% IF ( mandatoryB_zipcode ) %]
53
                [% IF ( mandatoryB_zipcode ) %]
54
					<label for="B_zipcode" class="required">
54
                    <label for="B_zipcode" class="required">
55
				[% ELSE %]
55
                [% ELSE %]
56
					<label for="B_zipcode">
56
                    <label for="B_zipcode">
57
				[% END %]
57
                [% END %]
58
				Zip/Postal code: </label>
58
                Zip/Postal code: </label>
59
                    <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" />
59
                    <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" />
60
	  [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
60
      [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
61
			</li>
61
            </li>
62
        [% END %]
62
        [% END %]
63
        [% UNLESS noB_country %]
63
        [% UNLESS noB_country %]
64
			<li>
64
            <li>
65
				[% IF ( mandatoryB_country ) %]
65
                [% IF ( mandatoryB_country ) %]
66
					<label for="B_country" class="required">
66
                    <label for="B_country" class="required">
67
				[% ELSE %]
67
                [% ELSE %]
68
					<label for="B_country">
68
                    <label for="B_country">
69
				[% END %]
69
                [% END %]
70
				Country: </label>
70
                Country: </label>
71
                    <input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" />
71
                    <input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" />
72
	  [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
72
      [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
73
			</li>
73
            </li>
74
        [% END %]
74
        [% END %]
75
        [% UNLESS noB_phone %]
75
        [% UNLESS noB_phone %]
76
            <li>
76
            <li>
Lines 85-91 Link Here
85
            </li>
85
            </li>
86
        [% END %]
86
        [% END %]
87
        [% UNLESS noB_email %]
87
        [% UNLESS noB_email %]
88
			<li>
88
            <li>
89
        [% IF ( mandatoryB_email ) %]
89
        [% IF ( mandatoryB_email ) %]
90
          <label for="B_email" class="required">
90
          <label for="B_email" class="required">
91
        [% ELSE %]
91
        [% ELSE %]
Lines 93-99 Link Here
93
        [% END %]
93
        [% END %]
94
        Email: </label>
94
        Email: </label>
95
            <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
95
            <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
96
		[% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
96
        [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
97
        [% END %]
97
        [% END %]
98
        [% UNLESS nocontactnote %]
98
        [% UNLESS nocontactnote %]
99
            <li>
99
            <li>
Lines 107-111 Link Here
107
        [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
107
        [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
108
            </li>
108
            </li>
109
        [% END %]
109
        [% END %]
110
			</ol>
110
            </ol>
111
		</fieldset>
111
        </fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc (-73 / +73 lines)
Lines 1-52 Link Here
1
		<fieldset class="rows" id="memberentry_altaddress">
1
        <fieldset class="rows" id="memberentry_altaddress">
2
            <legend id="alt_contact_lgd">Alternate contact</legend><ol>
2
            <legend id="alt_contact_lgd">Alternate contact</legend><ol>
3
        [% UNLESS noaltcontactsurname %]
3
        [% UNLESS noaltcontactsurname %]
4
			<li>
4
            <li>
5
			    [% IF ( mandatoryaltcontactsurname ) %]
5
                [% IF ( mandatoryaltcontactsurname ) %]
6
				<label for="altcontactsurname" class="required">
6
                <label for="altcontactsurname" class="required">
7
				[% ELSE %]
7
                [% ELSE %]
8
				<label for="altcontactsurname">
8
                <label for="altcontactsurname">
9
				[% END %]
9
                [% END %]
10
				Surname:</label>
10
                Surname:</label>
11
                    <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" />
11
                    <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" />
12
				[% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
12
                [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
13
			</li>
13
            </li>
14
        [% END %]
14
        [% END %]
15
        [% UNLESS noaltcontactfirstname %]
15
        [% UNLESS noaltcontactfirstname %]
16
			<li>
16
            <li>
17
			    [% IF ( mandatoryaltcontactfirstname ) %]
17
                [% IF ( mandatoryaltcontactfirstname ) %]
18
				<label for="altcontactfirstname" class="required">
18
                <label for="altcontactfirstname" class="required">
19
				[% ELSE %]
19
                [% ELSE %]
20
				<label for="altcontactfirstname">
20
                <label for="altcontactfirstname">
21
				[% END %]
21
                [% END %]
22
				First name:</label>
22
                First name:</label>
23
                    <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" />
23
                    <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" />
24
				[% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
24
                [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
25
			</li>
25
            </li>
26
        [% END %]
26
        [% END %]
27
        [% UNLESS noaltcontactaddress1 %]
27
        [% UNLESS noaltcontactaddress1 %]
28
			<li>
28
            <li>
29
			    [% IF ( mandatoryaltcontactaddress1 ) %]
29
                [% IF ( mandatoryaltcontactaddress1 ) %]
30
				<label for="altcontactaddress1" class="required">
30
                <label for="altcontactaddress1" class="required">
31
				[% ELSE %]
31
                [% ELSE %]
32
				<label for="altcontactaddress1">
32
                <label for="altcontactaddress1">
33
				[% END %]
33
                [% END %]
34
				Address:</label>
34
                Address:</label>
35
                    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" />
35
                    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" />
36
				[% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
36
                [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
37
			</li>
37
            </li>
38
        [% END %]
38
        [% END %]
39
        [% UNLESS noaltcontactaddress2 %]
39
        [% UNLESS noaltcontactaddress2 %]
40
			<li>
40
            <li>
41
			    [% IF ( mandatoryaltcontactaddress2 ) %]
41
                [% IF ( mandatoryaltcontactaddress2 ) %]
42
				<label for="altcontactaddress2" class="required">
42
                <label for="altcontactaddress2" class="required">
43
				[% ELSE %]
43
                [% ELSE %]
44
				<label for="altcontactaddress2">
44
                <label for="altcontactaddress2">
45
				[% END %]
45
                [% END %]
46
				Address 2:</label>
46
                Address 2:</label>
47
                <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" />
47
                <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" />
48
				[% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
48
                [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
49
			</li>
49
            </li>
50
        [% END %]
50
        [% END %]
51
        [% UNLESS noaltcontactzipcode %]
51
        [% UNLESS noaltcontactzipcode %]
52
                        <li>
52
                        <li>
Lines 61-112 Link Here
61
                        </li>
61
                        </li>
62
        [% END %]
62
        [% END %]
63
        [% UNLESS noaltcontactaddress3 %]
63
        [% UNLESS noaltcontactaddress3 %]
64
			<li>
64
            <li>
65
			    [% IF ( mandatoryaltcontactaddress3 ) %]
65
                [% IF ( mandatoryaltcontactaddress3 ) %]
66
				<label for="altcontactaddress3" class="required">
66
                <label for="altcontactaddress3" class="required">
67
				[% ELSE %]
67
                [% ELSE %]
68
				<label for="altcontactaddress3">
68
                <label for="altcontactaddress3">
69
				[% END %]
69
                [% END %]
70
				City:</label>
70
                City:</label>
71
                <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
71
                <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
72
				[% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
72
                [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
73
			</li>
73
            </li>
74
        [% END %]
74
        [% END %]
75
        [% UNLESS noaltcontactstate %]
75
        [% UNLESS noaltcontactstate %]
76
			<li>
76
            <li>
77
			    [% IF ( mandatoryaltcontactstate ) %]
77
                [% IF ( mandatoryaltcontactstate ) %]
78
				<label for="altcontactstate" class="required">
78
                <label for="altcontactstate" class="required">
79
				[% ELSE %]
79
                [% ELSE %]
80
				<label for="altcontactstate">
80
                <label for="altcontactstate">
81
				[% END %]
81
                [% END %]
82
				State:</label>
82
                State:</label>
83
                <input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
83
                <input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
84
				[% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
84
                [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
85
			</li>
85
            </li>
86
        [% END %]
86
        [% END %]
87
        [% UNLESS noaltcontactcountry %]
87
        [% UNLESS noaltcontactcountry %]
88
			<li>
88
            <li>
89
			    [% IF ( mandatoryaltcontactcountry ) %]
89
                [% IF ( mandatoryaltcontactcountry ) %]
90
				<label for="altcontactcountry" class="required">
90
                <label for="altcontactcountry" class="required">
91
				[% ELSE %]
91
                [% ELSE %]
92
				<label for="altcontactcountry">
92
                <label for="altcontactcountry">
93
				[% END %]
93
                [% END %]
94
				Country:</label>
94
                Country:</label>
95
                    <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" />
95
                    <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" />
96
				[% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
96
                [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
97
			</li>
97
            </li>
98
        [% END %]
98
        [% END %]
99
        [% UNLESS noaltcontactphone %]
99
        [% UNLESS noaltcontactphone %]
100
			<li>
100
            <li>
101
			    [% IF ( mandatoryaltcontactphone ) %]
101
                [% IF ( mandatoryaltcontactphone ) %]
102
				<label for="altcontactphone" class="required">
102
                <label for="altcontactphone" class="required">
103
				[% ELSE %]
103
                [% ELSE %]
104
				<label for="altcontactphone">
104
                <label for="altcontactphone">
105
				[% END %]
105
                [% END %]
106
				Phone:</label>
106
                Phone:</label>
107
                    <input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" />
107
                    <input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" />
108
				[% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
108
                [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
109
			</li>
109
            </li>
110
        [% END %]
110
        [% END %]
111
            </ol>
111
            </ol>
112
        </fieldset>
112
        </fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc (-82 / +82 lines)
Lines 1-112 Link Here
1
		<fieldset class="rows" id="memberentry_altaddress">
1
        <fieldset class="rows" id="memberentry_altaddress">
2
            <legend id="alt_contact_lgd">Alternate contact</legend><ol>
2
            <legend id="alt_contact_lgd">Alternate contact</legend><ol>
3
        [% UNLESS noaltcontactsurname %]
3
        [% UNLESS noaltcontactsurname %]
4
			<li>
4
            <li>
5
			    [% IF ( mandatoryaltcontactsurname ) %]
5
                [% IF ( mandatoryaltcontactsurname ) %]
6
				<label for="altcontactsurname" class="required">
6
                <label for="altcontactsurname" class="required">
7
				[% ELSE %]
7
                [% ELSE %]
8
				<label for="altcontactsurname">
8
                <label for="altcontactsurname">
9
				[% END %]
9
                [% END %]
10
				Surname:</label>
10
                Surname:</label>
11
                    <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" />
11
                    <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" />
12
				[% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
12
                [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
13
			</li>
13
            </li>
14
        [% END %]
14
        [% END %]
15
        [% UNLESS noaltcontactfirstname %]
15
        [% UNLESS noaltcontactfirstname %]
16
			<li>
16
            <li>
17
			    [% IF ( mandatoryaltcontactfirstname ) %]
17
                [% IF ( mandatoryaltcontactfirstname ) %]
18
				<label for="altcontactfirstname" class="required">
18
                <label for="altcontactfirstname" class="required">
19
				[% ELSE %]
19
                [% ELSE %]
20
				<label for="altcontactfirstname">
20
                <label for="altcontactfirstname">
21
				[% END %]
21
                [% END %]
22
				First name:</label>
22
                First name:</label>
23
                    <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" />
23
                    <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" />
24
				[% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
24
                [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
25
			</li>
25
            </li>
26
        [% END %]
26
        [% END %]
27
        [% UNLESS noaltcontactaddress1 %]
27
        [% UNLESS noaltcontactaddress1 %]
28
			<li>
28
            <li>
29
			    [% IF ( mandatoryaltcontactaddress1 ) %]
29
                [% IF ( mandatoryaltcontactaddress1 ) %]
30
				<label for="altcontactaddress1" class="required">
30
                <label for="altcontactaddress1" class="required">
31
				[% ELSE %]
31
                [% ELSE %]
32
				<label for="altcontactaddress1">
32
                <label for="altcontactaddress1">
33
				[% END %]
33
                [% END %]
34
				Address:</label>
34
                Address:</label>
35
                    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" />
35
                    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" />
36
				[% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
36
                [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
37
			</li>
37
            </li>
38
        [% END %]
38
        [% END %]
39
        [% UNLESS noaltcontactaddress2 %]
39
        [% UNLESS noaltcontactaddress2 %]
40
			<li>
40
            <li>
41
			    [% IF ( mandatoryaltcontactaddress2 ) %]
41
                [% IF ( mandatoryaltcontactaddress2 ) %]
42
				<label for="altcontactaddress2" class="required">
42
                <label for="altcontactaddress2" class="required">
43
				[% ELSE %]
43
                [% ELSE %]
44
				<label for="altcontactaddress2">
44
                <label for="altcontactaddress2">
45
				[% END %]
45
                [% END %]
46
				Address 2:</label>
46
                Address 2:</label>
47
                <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" />
47
                <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" />
48
				[% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
48
                [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
49
			</li>
49
            </li>
50
        [% END %]
50
        [% END %]
51
        [% UNLESS noaltcontactaddress3 %]
51
        [% UNLESS noaltcontactaddress3 %]
52
			<li>
52
            <li>
53
			    [% IF ( mandatoryaltcontactaddress3 ) %]
53
                [% IF ( mandatoryaltcontactaddress3 ) %]
54
				<label for="altcontactaddress3" class="required">
54
                <label for="altcontactaddress3" class="required">
55
				[% ELSE %]
55
                [% ELSE %]
56
				<label for="altcontactaddress3">
56
                <label for="altcontactaddress3">
57
				[% END %]
57
                [% END %]
58
				City:</label>
58
                City:</label>
59
                <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
59
                <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
60
				[% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
60
                [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
61
			</li>
61
            </li>
62
        [% END %]
62
        [% END %]
63
        [% UNLESS noaltcontactstate %]
63
        [% UNLESS noaltcontactstate %]
64
			<li>
64
            <li>
65
			    [% IF ( mandatoryaltcontactstate ) %]
65
                [% IF ( mandatoryaltcontactstate ) %]
66
				<label for="altcontactstate" class="required">
66
                <label for="altcontactstate" class="required">
67
				[% ELSE %]
67
                [% ELSE %]
68
				<label for="altcontactstate">
68
                <label for="altcontactstate">
69
				[% END %]
69
                [% END %]
70
				State:</label>
70
                State:</label>
71
                <input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
71
                <input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
72
				[% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
72
                [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
73
			</li>
73
            </li>
74
        [% END %]
74
        [% END %]
75
        [% UNLESS noaltcontactzipcode %]
75
        [% UNLESS noaltcontactzipcode %]
76
			<li>
76
            <li>
77
			    [% IF ( mandatoryaltcontactzipcode ) %]
77
                [% IF ( mandatoryaltcontactzipcode ) %]
78
				<label for="altcontactzipcode" class="required">
78
                <label for="altcontactzipcode" class="required">
79
				[% ELSE %]
79
                [% ELSE %]
80
				<label for="altcontactzipcode">
80
                <label for="altcontactzipcode">
81
				[% END %]
81
                [% END %]
82
				Zip/Postal code:</label>
82
                Zip/Postal code:</label>
83
                    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" />
83
                    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" />
84
				[% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
84
                [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
85
			</li>
85
            </li>
86
        [% END %]
86
        [% END %]
87
        [% UNLESS noaltcontactcountry %]
87
        [% UNLESS noaltcontactcountry %]
88
			<li>
88
            <li>
89
			    [% IF ( mandatoryaltcontactcountry ) %]
89
                [% IF ( mandatoryaltcontactcountry ) %]
90
				<label for="altcontactcountry" class="required">
90
                <label for="altcontactcountry" class="required">
91
				[% ELSE %]
91
                [% ELSE %]
92
				<label for="altcontactcountry">
92
                <label for="altcontactcountry">
93
				[% END %]
93
                [% END %]
94
				Country:</label>
94
                Country:</label>
95
                    <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" />
95
                    <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" />
96
				[% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
96
                [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
97
			</li>
97
            </li>
98
        [% END %]
98
        [% END %]
99
        [% UNLESS noaltcontactphone %]
99
        [% UNLESS noaltcontactphone %]
100
			<li>
100
            <li>
101
			    [% IF ( mandatoryaltcontactphone ) %]
101
                [% IF ( mandatoryaltcontactphone ) %]
102
				<label for="altcontactphone" class="required">
102
                <label for="altcontactphone" class="required">
103
				[% ELSE %]
103
                [% ELSE %]
104
				<label for="altcontactphone">
104
                <label for="altcontactphone">
105
				[% END %]
105
                [% END %]
106
				Phone:</label>
106
                Phone:</label>
107
                    <input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" />
107
                    <input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" />
108
				[% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
108
                [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
109
			</li>
109
            </li>
110
        [% END %]
110
        [% END %]
111
            </ol>
111
            </ol>
112
        </fieldset>
112
        </fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc (-7 / +7 lines)
Lines 19-25 Link Here
19
          [% END %]
19
          [% END %]
20
        [% END %]
20
        [% END %]
21
      </select>
21
      </select>
22
	  [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
22
      [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
23
      </li>
23
      </li>
24
    [% END %]
24
    [% END %]
25
        [% END %]
25
        [% END %]
Lines 32-38 Link Here
32
      [% END %]
32
      [% END %]
33
      Address: </label>
33
      Address: </label>
34
            <input type="text" id="address" name="address" size="35" value="[% address %]" />
34
            <input type="text" id="address" name="address" size="35" value="[% address %]" />
35
	  [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
35
      [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
36
    </li>
36
    </li>
37
        [% END %]
37
        [% END %]
38
        [% UNLESS nostreetnumber %]
38
        [% UNLESS nostreetnumber %]
Lines 56-62 Link Here
56
      [% END %]
56
      [% END %]
57
      Address 2: </label>
57
      Address 2: </label>
58
            <input type="text" id="address2" name="address2" size="35" value="[% address2 %]" />
58
            <input type="text" id="address2" name="address2" size="35" value="[% address2 %]" />
59
	  [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
59
      [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
60
    </li>
60
    </li>
61
        [% END %]
61
        [% END %]
62
        [% UNLESS nozipcode %]
62
        [% UNLESS nozipcode %]
Lines 93-99 Link Here
93
        [% END %]
93
        [% END %]
94
        </select>
94
        </select>
95
        [% END %]
95
        [% END %]
96
	  [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
96
      [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
97
    </li>
97
    </li>
98
        [% END %]
98
        [% END %]
99
        [% UNLESS nostate %]
99
        [% UNLESS nostate %]
Lines 105-111 Link Here
105
      [% END %]
105
      [% END %]
106
      State: </label>
106
      State: </label>
107
      <input type="text" name="state" id="state" size="20" value="[% state %]" />
107
      <input type="text" name="state" id="state" size="20" value="[% state %]" />
108
	  [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
108
      [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
109
    </li>
109
    </li>
110
        [% END %]
110
        [% END %]
111
        [% UNLESS nocountry %]
111
        [% UNLESS nocountry %]
Lines 117-124 Link Here
117
      [% END %]
117
      [% END %]
118
      Country: </label>
118
      Country: </label>
119
        <input type="text" name="country" id="country" size="20" value="[% country %]" />
119
        <input type="text" name="country" id="country" size="20" value="[% country %]" />
120
	  [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
120
      [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
121
    </li>
121
    </li>
122
        [% END %]
122
        [% END %]
123
	</ol>
123
    </ol>
124
</fieldset>
124
</fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc (-8 / +8 lines)
Lines 31-37 Link Here
31
          [% END %]
31
          [% END %]
32
        [% END %]
32
        [% END %]
33
      </select>
33
      </select>
34
	  [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
34
      [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
35
      </li>
35
      </li>
36
    [% END %]
36
    [% END %]
37
        [% END %]
37
        [% END %]
Lines 44-50 Link Here
44
      [% END %]
44
      [% END %]
45
      Address: </label>
45
      Address: </label>
46
            <input type="text" id="address" name="address" size="35" value="[% address %]" />
46
            <input type="text" id="address" name="address" size="35" value="[% address %]" />
47
	  [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
47
      [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
48
    </li>
48
    </li>
49
        [% END %]
49
        [% END %]
50
        [% UNLESS noaddress2 %]
50
        [% UNLESS noaddress2 %]
Lines 56-62 Link Here
56
      [% END %]
56
      [% END %]
57
      Address 2: </label>
57
      Address 2: </label>
58
            <input type="text" id="address2" name="address2" size="35" value="[% address2 %]" />
58
            <input type="text" id="address2" name="address2" size="35" value="[% address2 %]" />
59
	  [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
59
      [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
60
    </li>
60
    </li>
61
        [% END %]
61
        [% END %]
62
        [% UNLESS nocity %]
62
        [% UNLESS nocity %]
Lines 81-87 Link Here
81
        [% END %]
81
        [% END %]
82
        </select>
82
        </select>
83
        [% END %]
83
        [% END %]
84
	  [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
84
      [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
85
    </li>
85
    </li>
86
        [% END %]
86
        [% END %]
87
        [% UNLESS nostate %]
87
        [% UNLESS nostate %]
Lines 93-99 Link Here
93
      [% END %]
93
      [% END %]
94
      State: </label>
94
      State: </label>
95
      <input type="text" name="state" id="state" size="20" value="[% state %]" />
95
      <input type="text" name="state" id="state" size="20" value="[% state %]" />
96
	  [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
96
      [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
97
    </li>
97
    </li>
98
        [% END %]
98
        [% END %]
99
        [% UNLESS nozipcode %]
99
        [% UNLESS nozipcode %]
Lines 105-111 Link Here
105
      [% END %]
105
      [% END %]
106
      Zip/Postal code: </label>
106
      Zip/Postal code: </label>
107
            <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" />
107
            <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" />
108
	  [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
108
      [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
109
    </li>
109
    </li>
110
        [% END %]
110
        [% END %]
111
        [% UNLESS nocountry %]
111
        [% UNLESS nocountry %]
Lines 117-124 Link Here
117
      [% END %]
117
      [% END %]
118
      Country: </label>
118
      Country: </label>
119
        <input type="text" name="country" id="country" size="20" value="[% country %]" />
119
        <input type="text" name="country" id="country" size="20" value="[% country %]" />
120
	  [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
120
      [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
121
    </li>
121
    </li>
122
        [% END %]
122
        [% END %]
123
	</ol>
123
    </ol>
124
</fieldset>
124
</fieldset>
(-)a/members/boraccount.pl (-12 / +11 lines)
Lines 110-126 my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettyp Link Here
110
$template->param(%$data);
110
$template->param(%$data);
111
111
112
$template->param(
112
$template->param(
113
    finesview           => 1,
113
    finesview                  => 1,
114
    borrowernumber      => $borrowernumber,
114
    borrowernumber             => $borrowernumber,
115
    roadtype            => $roadtype,
115
    roadtype                   => $roadtype,
116
    branchname		=> GetBranchName($data->{'branchcode'}),
116
    branchname                 => GetBranchName( $data->{'branchcode'} ),
117
    total               => sprintf("%.2f",$total),
117
    total                      => sprintf( "%.2f", $total ),
118
    totalcredit         => $totalcredit,
118
    totalcredit                => $totalcredit,
119
    is_child            => ($data->{'category_type'} eq 'C'),
119
    is_child                   => ( $data->{'category_type'} eq 'C' ),
120
    reverse_col         => $reverse_col,
120
    reverse_col                => $reverse_col,
121
    accounts            => $accts,
121
    accounts                   => $accts,
122
    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
122
    activeBorrowerRelationship => ( C4::Context->preference('borrowerRelationship') ne '' ),
123
    RoutingSerials => C4::Context->preference('RoutingSerials'),
123
    RoutingSerials             => C4::Context->preference('RoutingSerials'),
124
);
124
);
125
125
126
output_html_with_http_headers $input, $cookie, $template->output;
126
output_html_with_http_headers $input, $cookie, $template->output;
127
- 

Return to bug 4041