From 4effd3cf55f2c1fcb640455c8b0d431627e21d0d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 1 Jun 2023 09:08:08 +0200 Subject: [PATCH] Bug 33798: Improve consistency of the vendor display view It was not consistent: indentation, bold, etc. This patch is suggesting a new style using .page-section and .rows Is it what we want? Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 4bd6abf9a2aa3a239ec3c8658e26d61ea198e84c) Signed-off-by: Martin Renvoize --- .../prog/en/modules/acqui/supplier.tt | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index 24ce36e5ba..9ad4c803d9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -93,6 +93,10 @@ [% INCLUDE 'doc-head-open.inc' %] Vendor [% name | html %] › Koha [% INCLUDE 'doc-head-close.inc' %] + @@ -304,7 +308,7 @@

[% name | html %]

-
+

Vendor details

Type: @@ -333,49 +337,49 @@ [% END %]

-
+

Ordering information

-

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

-

List prices are: [% listprice | html %]

-

Invoice prices are: [% invoiceprice | html %]

+

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

+

List prices are: [% listprice | html %]

+

Invoice prices are: [% invoiceprice | html %]

[% IF ( tax_rate ) %] -

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 %]

+

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: [% ( tax_rate || 0 ) * 100 | html %] %

+

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

+

Tax rate: [% ( tax_rate || 0 ) * 100 | html %] %

[% IF deliverytime.defined %] -

Delivery time: [% deliverytime | html %] days

+

Delivery time: [% deliverytime | html %] days

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

Notes: [% notes | html %]

+

Notes: [% notes | html %]

[% END %]
[% IF vendor.interfaces.count %] -
+

Interfaces

[% FOR i IN vendor.interfaces %]

[% i.name | html %]

[% IF i.type %] -

Type: [% AuthorisedValues.GetByCode( 'VENDOR_INTERFACE_TYPE', i.type) | html %]

+

Type: [% AuthorisedValues.GetByCode( 'VENDOR_INTERFACE_TYPE', i.type) | html %]

[% END %] [% IF i.uri %] -

URI: [% i.uri | html %]

+

URI: [% i.uri | html %]

[% END %] [% IF i.login %] -

Login: [% i.login | html %]

+

Login: [% i.login | html %]

[% END %] [% IF i.password %] -

Password: Show

+

Password: Show

[% END %] [% IF i.account_email %] -

Account email: [% i.account_email | html %]

+

Account email: [% i.account_email | html %]

[% END %] [% IF i.notes %] -

Notes: [% i.notes | html %]

+

Notes: [% i.notes | html %]

[% END %] [% END %]
@@ -384,14 +388,14 @@
-
+

Contact

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

Subscription details

Number of subscriptions: [% IF ( CAN_user_serials ) %] @@ -406,7 +410,7 @@

[% IF ( contracts ) %] -
+

Contract(s)

-- 2.39.5