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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (+7 lines)
Lines 1049-1054 fieldset { Link Here
1049
                margin-left: 1em;
1049
                margin-left: 1em;
1050
            }
1050
            }
1051
1051
1052
            &.radio {
1053
                display: inline-block;
1054
                margin: 0 1em 0 0;
1055
                padding: 0;
1056
                width: auto;
1057
            }
1058
1052
            &.yesno {
1059
            &.yesno {
1053
                float: none;
1060
                float: none;
1054
                width: auto;
1061
                width: auto;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-43 / +68 lines)
Lines 159-174 Link Here
159
159
160
        <fieldset class="rows">
160
        <fieldset class="rows">
161
            <legend>Ordering information</legend>
161
            <legend>Ordering information</legend>
162
            <ol class="radio"><li><label for="activestatus" class="radio">Vendor is:</label>
162
            <ol><li><label for="activestatus">Vendor is:</label>
163
                    [% IF ( active ) %]
163
                    [% IF ( active ) %]
164
                        <label for="activestatus">Active</label> <input type="radio" id="activestatus" name="status" value="1" checked="checked" />
164
                        <label class="radio" for="activestatus">
165
                        <label for="inactivestatus">Inactive</label> <input type="radio" id="inactivestatus" name="status" value="0" />
165
                            Active <input type="radio" id="activestatus" name="status" value="1" checked="checked" />
166
                        </label>
167
                        <label class="radio" for="inactivestatus">
168
                            Inactive <input type="radio" id="inactivestatus" name="status" value="0" />
169
                        </label>
166
                    [% ELSE %]
170
                    [% ELSE %]
167
                        <label for="activestatus">Active</label> <input type="radio" id="activestatus" name="status" value="1" />
171
                        <label class="radio" for="activestatus">
168
                        <label for="inactivestatus">Inactive</label> <input type="radio" id="inactivestatus" name="status" value="0" checked="checked" />
172
                            Active <input type="radio" id="activestatus" name="status" value="1" />
173
                        </label>
174
                        <label class="radio" for="inactivestatus">
175
                            Inactive <input type="radio" id="inactivestatus" name="status" value="0" checked="checked" />
176
                        </label>
169
                    [% END %]</li>
177
                    [% END %]</li>
170
            </ol>
171
            <ol>
172
            <li><label for="list_currency">List prices are: </label>
178
            <li><label for="list_currency">List prices are: </label>
173
                <select name="list_currency" id="list_currency">
179
                <select name="list_currency" id="list_currency">
174
                    [% FOREACH c IN currencies %]
180
                    [% FOREACH c IN currencies %]
Lines 191-244 Link Here
191
                    [% END %]
197
                    [% END %]
192
                </select>
198
                </select>
193
            </li>
199
            </li>
194
            </ol>
200
            <li><label for="gstyes">Tax number registered:</label>
195
            <ol class="radio">
196
            <li><label for="gstyes" class="radio">Tax number registered:</label>
197
                [% IF ( gstreg ) %]
201
                [% IF ( gstreg ) %]
198
                    <label for="gstyes">Yes</label> <input type="radio" name="gst" id="gstyes" value="1" checked="checked" />
202
                    <label class="radio" for="gstyes">
199
                    <label for="gstno">No</label> <input type="radio" name="gst" id="gstno" value="0" />
203
                        Yes <input type="radio" name="gst" id="gstyes" value="1" checked="checked" />
204
                    </label>
205
                    <label class="radio" for="gstno">
206
                        No <input type="radio" name="gst" id="gstno" value="0" />
207
                    </label>
200
                [% ELSE %]
208
                [% ELSE %]
201
                    <label for="gstyes">Yes</label> <input type="radio" name="gst" id="gstyes" value="1" />
209
                    <label class="radio" for="gstyes">
202
                    <label for="gstno">No</label> <input type="radio" name="gst" id="gstno" value="0" checked="checked" />
210
                        Yes <input type="radio" name="gst" id="gstyes" value="1" />
211
                    </label>
212
                    <label class="radio" for="gstno">
213
                        No <input type="radio" name="gst" id="gstno" value="0" checked="checked" />
214
                    </label>
203
                [% END %]</li>
215
                [% END %]</li>
204
            
216
205
            <li><label for="list_gstyes" class="radio">List prices:</label>
217
            <li><label for="list_gstyes">List prices:</label>
206
                [% IF ( listincgst ) %]
218
                [% IF ( listincgst ) %]
207
                    <label for="list_gstyes">Include tax</label> <input type="radio" id="list_gstyes" name="list_gst" value="1" checked="checked" />
219
                    <label class="radio" for="list_gstyes">
208
                    <label for="list_gstno">Don't include tax</label> <input type="radio" id="list_gstno" name="list_gst" value="0" />
220
                        Include tax <input type="radio" id="list_gstyes" name="list_gst" value="1" checked="checked" />
221
                    </label>
222
                    <label class="radio" for="list_gstno">
223
                        Don't include tax <input type="radio" id="list_gstno" name="list_gst" value="0" />
224
                    </label>
209
                [% ELSE %]
225
                [% ELSE %]
210
                    <label for="list_gstyes">Include tax</label> <input type="radio" id="list_gstyes" name="list_gst" value="1" />
226
                    <label class="radio" for="list_gstyes">
211
                    <label for="list_gstno">Don't include tax</label> <input type="radio" id="list_gstno" name="list_gst" value="0" checked="checked" />
227
                        Include tax <input type="radio" id="list_gstyes" name="list_gst" value="1" />
228
                    </label>
229
                    <label class="radio" for="list_gstno">
230
                        Don't include tax <input type="radio" id="list_gstno" name="list_gst" value="0" checked="checked" />
231
                    </label>
212
                [% END %]</li>
232
                [% END %]</li>
213
            
233
214
            <li><label for="invoice_gstyes" class="radio">Invoice prices:</label>
234
            <li><label for="invoice_gstyes">Invoice prices:</label>
215
                [% IF ( invoiceincgst ) %]
235
                [% IF ( invoiceincgst ) %]
216
                    <label for="invoice_gstyes">Include tax</label> <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" checked="checked" />
236
                    <label class="radio" for="invoice_gstyes">
217
                    <label for="invoice_gstno">Don't include tax</label> <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" />
237
                        Include tax <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" checked="checked" />
238
                    </label>
239
                    <label class="radio" for="invoice_gstno">
240
                        Don't include tax <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" />
241
                    </label>
218
                    [% ELSE %]
242
                    [% ELSE %]
219
                    <label for="invoice_gstyes">Include tax</label> <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" />
243
                    <label class="radio" for="invoice_gstyes">
220
                    <label for="invoice_gstno">Don't include tax</label> <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" checked="checked" />
244
                        Include tax <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" />
245
                    </label>
246
                    <label class="radio" for="invoice_gstno">
247
                        Don't include tax <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" checked="checked" />
248
                    </label>
221
                [% END %]</li>
249
                [% END %]</li>
222
            </ol>
250
223
            [% IF gst_values %]
251
            [% IF gst_values %]
224
                <ol>
252
                <li>
225
                  <li>
253
                  <label for="tax_rate">Tax rate: </label>
226
                    <label for="tax_rate">Tax rate: </label>
254
                  <select name="tax_rate" id="tax_rate">
227
                    <select name="tax_rate" id="tax_rate">
255
                  [% FOREACH gst IN gst_values %]
228
                    [% FOREACH gst IN gst_values %]
256
                    [% IF ( tax_rate == gst.option ) %]
229
                      [% IF ( tax_rate == gst.option ) %]
257
                      <option value="[% gst.option | html %]" selected="selected">[% gst.option * 100 | html %] %</option>
230
                        <option value="[% gst.option | html %]" selected="selected">[% gst.option * 100 | html %] %</option>
258
                    [% ELSE %]
231
                      [% ELSE %]
259
                      <option value="[% gst.option | html %]">[% gst.option * 100 | html %] %</option>
232
                        <option value="[% gst.option | html %]">[% gst.option * 100 | html %] %</option>
233
                      [% END %]
234
                    [% END %]
260
                    [% END %]
235
                    </select>
261
                  [% END %]
236
                  </li>
262
                  </select>
237
                </ol>
263
                </li>
238
            [% ELSE %]
264
            [% ELSE %]
239
                <input type="hidden" name="tax_rate" value="0" />
265
                <input type="hidden" name="tax_rate" value="0" />
240
            [% END %]
266
            [% END %]
241
            <ol>
242
            <li><label for="discount">Discount: </label>
267
            <li><label for="discount">Discount: </label>
243
                <input type="text" size="6" id="discount" name="discount" value="[% discount | format ("%.1f") %]" />%</li>
268
                <input type="text" size="6" id="discount" name="discount" value="[% discount | format ("%.1f") %]" />%</li>
244
            <li>
269
            <li>
Lines 246-252 Link Here
246
                <input type="text" size="2" id="deliverytime" name="deliverytime" value="[% deliverytime | html %]" /> days
271
                <input type="text" size="2" id="deliverytime" name="deliverytime" value="[% deliverytime | html %]" /> days
247
            </li>
272
            </li>
248
            <li><label for="notes">Notes: </label>
273
            <li><label for="notes">Notes: </label>
249
                <textarea cols="40" rows="4" id="notes" name="notes" >[% notes | html %]</textarea></li></ol>
274
                <textarea cols="40" rows="4" id="notes" name="notes" >[% notes | html %]</textarea></li>
275
            </ol>
250
        </fieldset>
276
        </fieldset>
251
        <fieldset class="action"><input type="submit" value="Save" /> [% IF ( booksellerid ) %]
277
        <fieldset class="action"><input type="submit" value="Save" /> [% IF ( booksellerid ) %]
252
        <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
278
        <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% ELSE %]<a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
253
- 

Return to bug 21089