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

(-)a/koha-tmpl/intranet-tmpl/prog/en/columns.def (-3 / +3 lines)
Lines 14-20 Link Here
14
<field name="borrowers.address2">Address 2</field>
14
<field name="borrowers.address2">Address 2</field>
15
<field name="borrowers.city">City</field>
15
<field name="borrowers.city">City</field>
16
<field name="borrowers.state">State</field>
16
<field name="borrowers.state">State</field>
17
<field name="borrowers.zipcode">Zip/postal code</field>
17
<field name="borrowers.zipcode">ZIP/Postal code</field>
18
<field name="borrowers.country">Country</field>
18
<field name="borrowers.country">Country</field>
19
<field name="borrowers.phone">Primary phone</field>
19
<field name="borrowers.phone">Primary phone</field>
20
<field name="borrowers.phonepro">Secondary phone</field>
20
<field name="borrowers.phonepro">Secondary phone</field>
Lines 28-34 Link Here
28
<field name="borrowers.B_address2">Alternate address: Address 2</field>
28
<field name="borrowers.B_address2">Alternate address: Address 2</field>
29
<field name="borrowers.B_city">Alternate address: City</field>
29
<field name="borrowers.B_city">Alternate address: City</field>
30
<field name="borrowers.B_state">Alternate address: State</field>
30
<field name="borrowers.B_state">Alternate address: State</field>
31
<field name="borrowers.B_zipcode">Alternate address: Zip/postal code</field>
31
<field name="borrowers.B_zipcode">Alternate address: ZIP/Postal code</field>
32
<field name="borrowers.B_country">Alternate address: Country</field>
32
<field name="borrowers.B_country">Alternate address: Country</field>
33
<field name="borrowers.B_phone">Alternate address: Phone</field>
33
<field name="borrowers.B_phone">Alternate address: Phone</field>
34
<field name="borrowers.B_email">Alternate address: Email</field>
34
<field name="borrowers.B_email">Alternate address: Email</field>
Lines 42-48 Link Here
42
<field name="borrowers.contactfirstname">Alternate contact: First name</field>
42
<field name="borrowers.contactfirstname">Alternate contact: First name</field>
43
<field name="borrowers.contacttitle">Alternate contact: Title</field>
43
<field name="borrowers.contacttitle">Alternate contact: Title</field>
44
<field name="borrowers.altcontactstate">Alternate contact: State</field>
44
<field name="borrowers.altcontactstate">Alternate contact: State</field>
45
<field name="borrowers.altcontactzipcode">Alternate contact: Zip/postal code</field>
45
<field name="borrowers.altcontactzipcode">Alternate contact: ZIP/Postal code</field>
46
<field name="borrowers.altcontactcountry">Alternate contact: Country</field>
46
<field name="borrowers.altcontactcountry">Alternate contact: Country</field>
47
<field name="borrowers.altcontactphone">Alternate contact: Phone</field>
47
<field name="borrowers.altcontactphone">Alternate contact: Phone</field>
48
<field name="borrowers.cardnumber">Card number</field>
48
<field name="borrowers.cardnumber">Card number</field>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt (-1 / +1 lines)
Lines 133-139 tinyMCE.init({ Link Here
133
        <li><label for="branchaddress3">Address line 3: </label><input type="text" name="branchaddress3" id="branchaddress3" size="60" value="[% branchaddress3 |html %]" /></li>
133
        <li><label for="branchaddress3">Address line 3: </label><input type="text" name="branchaddress3" id="branchaddress3" size="60" value="[% branchaddress3 |html %]" /></li>
134
        <li><label for="branchcity">City: </label><input type="text" name="branchcity" id="branchcity" size="60" value="[% branchcity |html %]" /></li>
134
        <li><label for="branchcity">City: </label><input type="text" name="branchcity" id="branchcity" size="60" value="[% branchcity |html %]" /></li>
135
        <li><label for="branchstate">State: </label><input type="text" name="branchstate" id="branchstate" size="60" value="[% branchstate |html %]" /></li>
135
        <li><label for="branchstate">State: </label><input type="text" name="branchstate" id="branchstate" size="60" value="[% branchstate |html %]" /></li>
136
        <li><label for="branchzip">Zip/Postal code: </label><input type="text" name="branchzip" id="branchzip"  size="25" maxlength="25" value="[% branchzip |html %]" /></li>
136
        <li><label for="branchzip">ZIP/Postal code: </label><input type="text" name="branchzip" id="branchzip"  size="25" maxlength="25" value="[% branchzip |html %]" /></li>
137
        <li><label for="branchcountry">Country: </label><input type="text" name="branchcountry" id="branchcountry" size="60" value="[% branchcountry |html %]" /></li>
137
        <li><label for="branchcountry">Country: </label><input type="text" name="branchcountry" id="branchcountry" size="60" value="[% branchcountry |html %]" /></li>
138
        <li><label for="branchphone">Phone: </label><input type="text" name="branchphone" id="branchphone" size="60" value="[% branchphone |html %]" /></li>
138
        <li><label for="branchphone">Phone: </label><input type="text" name="branchphone" id="branchphone" size="60" value="[% branchphone |html %]" /></li>
139
        <li><label for="branchfax">Fax: </label><input type="text" name="branchfax" id="branchfax" size="60" value="[% branchfax |html %]" /></li>
139
        <li><label for="branchfax">Fax: </label><input type="text" name="branchfax" id="branchfax" size="60" value="[% branchfax |html %]" /></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt (-3 / +3 lines)
Lines 87-93 Link Here
87
                    <input type="text" name="city_state" id="city_state" size="80" maxlength="100" value="[% city.city_state |html %]" />
87
                    <input type="text" name="city_state" id="city_state" size="80" maxlength="100" value="[% city.city_state |html %]" />
88
                </li>
88
                </li>
89
                <li>
89
                <li>
90
                    <label for="city_zipcode" class="required">Zip/Postal code: </label>
90
                    <label for="city_zipcode" class="required">ZIP/Postal code: </label>
91
                    <input type="text" name="city_zipcode" id="city_zipcode" size="20" maxlength="20" value="[% city.city_zipcode %]" required="required" class="required" /> <span class="required">Required</span>
91
                    <input type="text" name="city_zipcode" id="city_zipcode" size="20" maxlength="20" value="[% city.city_zipcode %]" required="required" class="required" /> <span class="required">Required</span>
92
                </li>
92
                </li>
93
                <li>
93
                <li>
Lines 117-123 Link Here
117
            <tr><th>State</th>
117
            <tr><th>State</th>
118
                <td>[% city.city_state %]</td>
118
                <td>[% city.city_state %]</td>
119
            </tr>
119
            </tr>
120
            <tr><th>Zip/Postal code</th>
120
            <tr><th>ZIP/Postal code</th>
121
                <td>[% city.city_zipcode %]</td>
121
                <td>[% city.city_zipcode %]</td>
122
            </tr>
122
            </tr>
123
            <tr><th>Country</th>
123
            <tr><th>Country</th>
Lines 152-158 Link Here
152
                <th>City ID</th>
152
                <th>City ID</th>
153
                <th>City</th>
153
                <th>City</th>
154
                <th>State</th>
154
                <th>State</th>
155
                <th>Zip/Postal code</th>
155
                <th>ZIP/Postal code</th>
156
                <th>Country</th>
156
                <th>Country</th>
157
                <th>&nbsp;</th>
157
                <th>&nbsp;</th>
158
                <th>&nbsp;</th>
158
                <th>&nbsp;</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref (-2 / +2 lines)
Lines 56-60 I18N/L10N: Link Here
56
        - pref: AddressFormat
56
        - pref: AddressFormat
57
          default: us
57
          default: us
58
          choices:
58
          choices:
59
              us: US style ([Street number], [Address] - [City], [Zip/Postal Code], [Country])
59
              us: US style ([Street number], [Address] - [City], [ZIP/Postal Code], [Country])
60
              de: German style ([Address] [Street number] - [Zip/Postal Code] [City] - [Country])
60
              de: German style ([Address] [Street number] - [ZIP/Postal Code] [City] - [Country])
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt (-1 / +1 lines)
Lines 104-110 Link Here
104
			</tr>
104
			</tr>
105
105
106
			<tr>
106
			<tr>
107
            <td rowspan="2">Zip code</td>
107
            <td rowspan="2">ZIP/Postal code</td>
108
			<td><input type="radio" name="Line" value="zipcode" /></td>
108
			<td><input type="radio" name="Line" value="zipcode" /></td>
109
			<td><input type="radio" name="Column" value="zipcode" /></td>
109
			<td><input type="radio" name="Column" value="zipcode" /></td>
110
			<td><select name="Filter"  size="1" id="zipcode">
110
			<td><select name="Filter"  size="1" id="zipcode">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt (-2 / +2 lines)
Lines 235-241 Link Here
235
                                                <th>Category</th>
235
                                                <th>Category</th>
236
                                                <th>City</th>
236
                                                <th>City</th>
237
                                                <th>State</th>
237
                                                <th>State</th>
238
                                                <th>Zip/Postal code</th>
238
                                                <th>ZIP/Postal code</th>
239
                                                <th>Country</th>
239
                                                <th>Country</th>
240
                                                <th class="title-string">Registration date</th>
240
                                                <th class="title-string">Registration date</th>
241
                                                <th class="title-string">Expiry date</th>
241
                                                <th class="title-string">Expiry date</th>
Lines 302-308 Link Here
302
                                                [% CASE 'state' %]
302
                                                [% CASE 'state' %]
303
                                                State
303
                                                State
304
                                                [% CASE 'zipcode' %]
304
                                                [% CASE 'zipcode' %]
305
                                                Zip/Postal code
305
                                                ZIP/Postal code
306
                                                [% CASE 'country' %]
306
                                                [% CASE 'country' %]
307
                                                Country
307
                                                Country
308
                                                [% CASE 'sort1' %]
308
                                                [% CASE 'sort1' %]
(-)a/reports/borrowers_stats.pl (-2 / +1 lines)
Lines 227-233 sub calculate { Link Here
227
            }
227
            }
228
228
229
            if    ( $i == 0)  { $cell{crit} = "Cat code"; }
229
            if    ( $i == 0)  { $cell{crit} = "Cat code"; }
230
            elsif ( $i == 1 ) { $cell{crit} = "Zip code"; }
230
            elsif ( $i == 1 ) { $cell{crit} = "ZIP/Postal code"; }
231
            elsif ( $i == 2 ) { $cell{crit} = "Branch code"; }
231
            elsif ( $i == 2 ) { $cell{crit} = "Branch code"; }
232
            elsif ( $i == 3 ||
232
            elsif ( $i == 3 ||
233
                    $i == 4 ) { $cell{crit} = "Date of birth"; }
233
                    $i == 4 ) { $cell{crit} = "Date of birth"; }
234
- 

Return to bug 15373