@@ -, +, @@ vendors - Add spaces after button icons - Change "Add contact" to "Add another contact" in hopes of making it less ambiguous whether clicking it will submit the whole form. - Eliminate duplicate headers on the vendor view page by making the contact name the subheading for each individual contact. --- .../prog/en/modules/acqui/supplier.tt | 76 ++++++++++++---------- 1 file changed, 41 insertions(+), 35 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -16,11 +16,12 @@
  • - [% IF contact.id %]
  • [% END %] + [% IF contact.id %]
  • [% END %] [% END %] + [% BLOCK show_contact %] -

    Contact name: [% contact.name %]

    +

    [% contact.name %]

    Position: [% contact.position %]

    Phone: [% contact.phone %]

    Alternative phone: [% contact.altphone %]

    @@ -32,6 +33,7 @@

    Notes: [% contact.notes %]

    [% END %] [% END %] + [% INCLUDE 'doc-head-open.inc' %] Koha › Vendor [% bookselname %] @@ -132,7 +134,7 @@ function delete_contact() { [% INCLUDE edit_contact %] [% END %] - +
    @@ -242,41 +244,45 @@ function delete_contact() { [% IF ( accountnumber ) %]

    Account number: [% accountnumber %]

    [% END %] + +
    +

    Ordering information

    +

    Vendor is: + [% IF ( active ) %] + Active + [% ELSE %] + Inactive + [% END %]

    +

    List prices are: [% listprice %]

    +

    Invoice prices are: [% invoiceprice %]

    + [% IF ( gstrate ) %]

    Tax number registered: + [% IF ( gstreg ) %]Yes[% ELSE %]No[% END %]

    +

    List item price includes tax: + [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]

    +

    Invoice item price includes tax: + [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]

    [% END %] +

    Discount: + [% discount | format("%.1f") %] %

    +

    Tax rate: + [% 0 + gstrate * 100 | format("%.1f") %] %

    + [% IF deliverytime.defined %] +

    Delivery time: + [% deliverytime %] days

    + [% END %] + [% IF ( notes ) %]

    Notes: + [% notes %]

    [% END %]
    - [% FOREACH contact IN contacts %] -
    -

    Contact details

    +
    + +
    +

    Contact

    + [% FOREACH contact IN contacts %] [% INCLUDE show_contact %] -
    - [% END %] -
    -
    -

    Ordering information

    -

    Vendor is: - [% IF ( active ) %] - Active - [% ELSE %] - Inactive - [% END %]

    -

    List prices are: [% listprice %]

    -

    Invoice prices are: [% invoiceprice %]

    - [% IF ( gstrate ) %]

    Tax number registered: - [% IF ( gstreg ) %]Yes[% ELSE %]No[% END %]

    -

    List item price includes tax: - [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]

    -

    Invoice item price includes tax: - [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]

    [% END %] -

    Discount: - [% discount | format("%.1f") %] %

    -

    Tax rate: - [% 0 + gstrate * 100 | format("%.1f") %] %

    - [% IF deliverytime.defined %] -

    Delivery time: - [% deliverytime %] days

    - [% END %] - [% IF ( notes ) %]

    Notes: - [% notes %]

    [% END %] + [% END %] +
    + + [% IF ( contracts ) %]

    Contract(s)

    --