@@ -, +, @@ --- .../prog/en/modules/acqui/supplier.tt | 91 +++++++++---------- 1 file changed, 42 insertions(+), 49 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -322,59 +322,53 @@ [% ELSE %]
Type: [% type | html %]
-Company name: [% name | html %]
-Postal address: [% postal | html %]
-Physical address: [% address1 | html %][% address2 | html %][% address3 | html %][% address4 | html %]
-Phone: [% phone | html %]
-Fax: [% fax | html %]
- [% IF ( url ) %] -Website: [% url | html %]
- [% END %] - [% IF ( accountnumber ) %] -Account number: [% accountnumber | html %]
- [% END %] +Type: [% type | html %]
+Company name: [% name | html %]
+Postal address: [% postal | html %]
+Physical address: [% address1 | html %][% address2 | html %][% address3 | html %][% address4 | html %]
+Phone: [% phone | html %]
+Fax: [% fax | html %]
+ [% IF ( url ) %] +Website: [% url | html %]
+ [% END %] + [% IF ( accountnumber ) %] +Account number: [% accountnumber | html %]
+ [% END %] +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 %]
[% END %] -Discount: - [% discount | format("%.1f") %] %
-Tax rate: - [% ( tax_rate || 0 ) * 100 | html %] %
- [% IF deliverytime.defined %] -Delivery time: - [% deliverytime | html %] days
- [% END %] - [% IF ( notes ) %]Notes: - [% notes | html %]
[% END %] -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 %]
+ [% END %] +Discount: [% discount | format("%.1f") %] %
+Tax rate: [% ( tax_rate || 0 ) * 100 | html %] %
+ [% IF deliverytime.defined %] +Delivery time: [% deliverytime | html %] days
+ [% END %] + [% IF ( notes ) %] +Notes: [% notes | html %]
+ [% END %] +Number of subscriptions: [% IF ( CAN_user_serials ) %] @@ -383,14 +377,13 @@ [% subscriptioncount | html %] [% END %]
-