From ed2ce03b99ae808ba1a0297d40a676c5b7f929f5 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 10 Mar 2016 19:35:02 +0000 Subject: [PATCH] Bug 7736 [QA Followup] - Fix column headers, values and spelling --- admin/edi_accounts.pl | 42 +++++++++++----------- .../prog/en/modules/admin/edi_accounts.tt | 19 ++++++---- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/admin/edi_accounts.pl b/admin/edi_accounts.pl index 83cc113..7d86af8 100755 --- a/admin/edi_accounts.pl +++ b/admin/edi_accounts.pl @@ -51,27 +51,6 @@ if ( $op eq 'acct_form' ) { } ); $template->param( vendors => \@vendors ); - $template->param( - code_qualifiers => [ - { - code => '14', - description => 'EAN International', - }, - { - code => '31B', - description => 'US SAN Agency', - }, - { - code => '91', - description => 'Assigned by supplier', - }, - { - code => '92', - description => 'Assigned by buyer', - }, - ] - ); - } elsif ( $op eq 'delete_confirm' ) { show_account(); @@ -129,6 +108,27 @@ else { $template->param( ediaccounts => \@ediaccounts ); } +$template->param( + code_qualifiers => [ + { + code => '14', + description => 'EAN International', + }, + { + code => '31B', + description => 'US SAN Agency', + }, + { + code => '91', + description => 'Assigned by supplier', + }, + { + code => '92', + description => 'Assigned by buyer', + }, + ] +); + output_html_with_http_headers( $input, $cookie, $template->output ); sub get_account { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt index d7e46ee..fb20ba6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt @@ -127,11 +127,11 @@ [% FOREACH qualifier IN code_qualifiers %] [% IF qualifier.code == account.id_code_qualifier %] [% ELSE %] [% END %] [% END %] @@ -174,7 +174,7 @@ [% END %]
  • - + [% IF account.auto_orders %] [% ELSE %] @@ -233,8 +233,8 @@ Password Download Directory Upload Directory - id_code_type - id_code + Qualifier + SAN Quotes Orders Invoices @@ -255,7 +255,14 @@ [% IF account.password %]xxxxx[% END %] [% account.download_directory %] [% account.upload_directory %] - [% account.id_code_qualifier %] + + [% FOREACH qualifier IN code_qualifiers %] + [% IF qualifier.code == account.id_code_qualifier %] + [% qualifier.description %] + [% END %] + [% END %] + ([% account.id_code_qualifier %]) + [% account.san %] [% IF account.quotes_enabled %] Y -- 2.1.4